aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-11 20:27:52 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-01-02 12:06:24 -0300
commit78dab2a8569408658542e462a957ea5a35aa4679 (patch)
tree2560e30a39209010fb82aeed6c706b48b9698a68 /activerecord/test/cases
parente8615b99c6bced24f7e6866d37589588f3924cc1 (diff)
downloadrails-78dab2a8569408658542e462a957ea5a35aa4679.tar.gz
rails-78dab2a8569408658542e462a957ea5a35aa4679.tar.bz2
rails-78dab2a8569408658542e462a957ea5a35aa4679.zip
Remove support to activerecord-deprecated_finders
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/associations/extension_test.rb3
-rw-r--r--activerecord/test/cases/relations_test.rb2
2 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/test/cases/associations/extension_test.rb b/activerecord/test/cases/associations/extension_test.rb
index 9d373cd73b..b161cde335 100644
--- a/activerecord/test/cases/associations/extension_test.rb
+++ b/activerecord/test/cases/associations/extension_test.rb
@@ -76,7 +76,6 @@ class AssociationsExtensionsTest < ActiveRecord::TestCase
private
def extend!(model)
- builder = ActiveRecord::Associations::Builder::HasMany.new(model, :association_name, nil, {}) { }
- builder.define_extensions(model)
+ ActiveRecord::Associations::Builder::HasMany.define_extensions(model, :association_name) { }
end
end
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 0210ae6487..fb9258c038 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -358,7 +358,7 @@ class RelationTest < ActiveRecord::TestCase
def test_null_relation_calculations_methods
assert_no_queries(ignore_none: false) do
assert_equal 0, Developer.none.count
- assert_equal 0, Developer.none.calculate(:count, nil, {})
+ assert_equal 0, Developer.none.calculate(:count, nil)
assert_equal nil, Developer.none.calculate(:average, 'salary')
end
end