aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/scoping/named_scoping_test.rb
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-04-27 17:00:49 -0400
committerGitHub <noreply@github.com>2018-04-27 17:00:49 -0400
commita189adf4e5d58dcb05012b3b569d1de2fa496974 (patch)
tree1d8059720d7dde453fbbec00b205f39604e3f786 /activerecord/test/cases/scoping/named_scoping_test.rb
parentbb2a3afafbcdfac3294479f042cb7a8f7f3d6739 (diff)
parentd1f58e9922de753b5a6b1dc7a8ff2a6cf9463eeb (diff)
downloadrails-a189adf4e5d58dcb05012b3b569d1de2fa496974.tar.gz
rails-a189adf4e5d58dcb05012b3b569d1de2fa496974.tar.bz2
rails-a189adf4e5d58dcb05012b3b569d1de2fa496974.zip
Merge pull request #32727 from utilum/assert_dont_expects
Use MethodCallAssertions instead of mocha expects
Diffstat (limited to 'activerecord/test/cases/scoping/named_scoping_test.rb')
-rw-r--r--activerecord/test/cases/scoping/named_scoping_test.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/test/cases/scoping/named_scoping_test.rb b/activerecord/test/cases/scoping/named_scoping_test.rb
index 6cb252edaf..4214f347fb 100644
--- a/activerecord/test/cases/scoping/named_scoping_test.rb
+++ b/activerecord/test/cases/scoping/named_scoping_test.rb
@@ -488,8 +488,9 @@ class NamedScopingTest < ActiveRecord::TestCase
[:public_method, :protected_method, :private_method].each do |reserved_method|
assert Topic.respond_to?(reserved_method, true)
- ActiveRecord::Base.logger.expects(:warn)
- silence_warnings { Topic.scope(reserved_method, -> {}) }
+ assert_called(ActiveRecord::Base.logger, :warn) do
+ silence_warnings { Topic.scope(reserved_method, -> {}) }
+ end
end
end