From bcb39fa03dda9c66ffb08ec06214f99ef150708a Mon Sep 17 00:00:00 2001 From: Whitney Young Date: Fri, 25 Oct 2013 14:15:56 -0300 Subject: [PATCH] Fixed tests targeting Rails ~> 4.0.0. --- .../active_record/active_record_relation_methods_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/models/active_record/active_record_relation_methods_spec.rb b/spec/models/active_record/active_record_relation_methods_spec.rb index 548d7c9..c33951f 100644 --- a/spec/models/active_record/active_record_relation_methods_spec.rb +++ b/spec/models/active_record/active_record_relation_methods_spec.rb @@ -39,7 +39,7 @@ if defined? ActiveRecord context "when total_count receives options" do it "should return a distinct total count for rails ~> 4.0.0" do - if ActiveRecord::VERSION::STRING < "4.1.0" + if ActiveRecord::VERSION::STRING > "4.0.0" && ActiveRecord::VERSION::STRING < "4.1.0" User.page(1).total_count(:name, :distinct => true).should == 4 end end @@ -53,7 +53,7 @@ if defined? ActiveRecord context "when count receives options" do it "should return a distinct set by column for rails ~> 4.0.0" do - if ActiveRecord::VERSION::STRING < "4.1.0" + if ActiveRecord::VERSION::STRING > "4.0.0" && ActiveRecord::VERSION::STRING < "4.1.0" User.page(1).count(:name, :distinct => true).should == 4 end end