Use AR #where instead of #order in #apply_options_to_scope for option with condition

Maxim Stukalo
1 parent feadb8f2
Showing 2 changed files with 6 additions and 2 deletions Show diff stats
lib/acts_as_follower/follower_lib.rb
test/acts_as_follower_test.rb
@@ -22,7 +22,7 @@ module ActsAsFollower
         scope = scope.joins(options[:joins])
       end
       if options.has_key?(:where)
-        scope = scope.order(options[:where])
+        scope = scope.where(options[:where])
       end
       if options.has_key?(:order)
         scope = scope.order(options[:order])
@@ -134,9 +134,13 @@ class ActsAsFollowerTest &lt; ActiveSupport::TestCase
         assert_equal [], @jon.all_following
       end
  
-      should "accept AR options" do
+      should "accept AR limit option" do
         assert_equal 1, @sam.all_following(:limit => 1).count
       end
+
+      should "accept AR where option" do
+        assert_equal 1, @sam.all_following(:where => { :id => @oasis.id }).count
+      end
     end
  
     context "following_by_type" do
...	...	@@ -22,7 +22,7 @@ module ActsAsFollower
22	22	scope = scope.joins(options[:joins])
23	23	end
24	24	if options.has_key?(:where)
25		- scope = scope.order(options[:where])
	25	+ scope = scope.where(options[:where])
26	26	end
27	27	if options.has_key?(:order)
28	28	scope = scope.order(options[:order])
...	...
...	...	@@ -134,9 +134,13 @@ class ActsAsFollowerTest < ActiveSupport::TestCase
134	134	assert_equal [], @jon.all_following
135	135	end
136	136
137		- should "accept AR options" do
	137	+ should "accept AR limit option" do
138	138	assert_equal 1, @sam.all_following(:limit => 1).count
139	139	end
	140	+
	141	+ should "accept AR where option" do
	142	+ assert_equal 1, @sam.all_following(:where => { :id => @oasis.id }).count
	143	+ end
140	144	end
141	145
142	146	context "following_by_type" do
...	...