Fixed Follow.recent method for default parameter

jrasanen · Mar 18, 2016 · c376bfa · c376bfa
1 parent 0ce6aee
commit c376bfa
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/lib/acts_as_follower/follow_scopes.rb b/lib/acts_as_follower/follow_scopes.rb
@@ -18,8 +18,8 @@ def for_followable_type(followable_type)
       where(:followable_type => followable_type)
     end
 
-    def recent(from)
-      where(["created_at > ?", (from || 2.weeks.ago).to_s(:db)])
+    def recent(from = 2.weeks.ago)
+      where(["created_at > ?", (from).to_s(:db)])
     end
 
     def descending

diff --git a/test/acts_as_followable_test.rb b/test/acts_as_followable_test.rb
@@ -14,6 +14,25 @@ class ActsAsFollowableTest < ActiveSupport::TestCase
     end
   end
 
+  context "Follow recent" do
+    setup do
+      @sam = FactoryGirl.create(:sam)
+      @jon = FactoryGirl.create(:jon)
+      Follow.create(followable_id: @jon.id, follower_id: @sam.id, follower_type: 'User',
+                    followable_type: 'User', created_at: 4.weeks.ago)
+      @jon.follow(@sam)
+    end
+
+    should "default returns records from last 2 weeks" do
+      assert_equal 1, Follow.recent.count
+    end
+
+    should "returns records from 4 weeks" do
+      assert_equal 2, Follow.recent(4.weeks.ago).count
+    end
+  end
+
+
   context "acts_as_followable" do
     setup do
       @sam = FactoryGirl.create(:sam)