diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-06-08 18:46:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-08 18:46:47 -0400 |
| commit | 34b16ce86526c9b8ce9abfe1190eadd0caf7be49 (patch) | |
| tree | cc1da202ae94bcecf1ac12ba9e53f2d104e99702 | |
| parent | c07c708cf692658fc8e004b5e01e42edadaad5a1 (diff) | |
| parent | f1de019993ee52cd64f81cd5d168736bc2618558 (diff) | |
| download | rails-34b16ce86526c9b8ce9abfe1190eadd0caf7be49.tar.gz rails-34b16ce86526c9b8ce9abfe1190eadd0caf7be49.tar.bz2 rails-34b16ce86526c9b8ce9abfe1190eadd0caf7be49.zip | |
Merge pull request #33103 from bogdanvlviv/fix-using-of-method_call_assertions
Remove extra `include ActiveSupport::Testing::MethodCallAssertions`
| -rw-r--r-- | activesupport/test/testing/method_call_assertions_test.rb | 3 | ||||
| -rw-r--r-- | railties/test/application/per_request_digest_cache_test.rb | 2 | ||||
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/activesupport/test/testing/method_call_assertions_test.rb b/activesupport/test/testing/method_call_assertions_test.rb index 4af000bb7e..0500e47def 100644 --- a/activesupport/test/testing/method_call_assertions_test.rb +++ b/activesupport/test/testing/method_call_assertions_test.rb @@ -1,11 +1,8 @@ # frozen_string_literal: true require "abstract_unit" -require "active_support/testing/method_call_assertions" class MethodCallAssertionsTest < ActiveSupport::TestCase - include ActiveSupport::Testing::MethodCallAssertions - class Level def increment; 1; end def decrement; end diff --git a/railties/test/application/per_request_digest_cache_test.rb b/railties/test/application/per_request_digest_cache_test.rb index 10d3313f6e..ab055c7648 100644 --- a/railties/test/application/per_request_digest_cache_test.rb +++ b/railties/test/application/per_request_digest_cache_test.rb @@ -5,11 +5,9 @@ require "rack/test" require "minitest/mock" require "action_view" -require "active_support/testing/method_call_assertions" class PerRequestDigestCacheTest < ActiveSupport::TestCase include ActiveSupport::Testing::Isolation - include ActiveSupport::Testing::MethodCallAssertions include Rack::Test::Methods setup do diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index 3cde7c03b0..516c457e48 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -14,6 +14,7 @@ require "bundler/setup" unless defined?(Bundler) require "active_support" require "active_support/testing/autorun" require "active_support/testing/stream" +require "active_support/testing/method_call_assertions" require "active_support/test_case" RAILS_FRAMEWORK_ROOT = File.expand_path("../../..", __dir__) @@ -430,6 +431,7 @@ class ActiveSupport::TestCase include TestHelpers::Rack include TestHelpers::Generation include ActiveSupport::Testing::Stream + include ActiveSupport::Testing::MethodCallAssertions def frozen_error_class Object.const_defined?(:FrozenError) ? FrozenError : RuntimeError |