aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/configuration/middleware_stack_proxy_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/test/configuration/middleware_stack_proxy_test.rb')
-rw-r--r--railties/test/configuration/middleware_stack_proxy_test.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/railties/test/configuration/middleware_stack_proxy_test.rb b/railties/test/configuration/middleware_stack_proxy_test.rb
index 5984c0b425..d5072614cf 100644
--- a/railties/test/configuration/middleware_stack_proxy_test.rb
+++ b/railties/test/configuration/middleware_stack_proxy_test.rb
@@ -1,6 +1,8 @@
-require 'minitest/autorun'
+require 'active_support'
+require 'active_support/testing/autorun'
require 'rails/configuration'
require 'active_support/test_case'
+require 'minitest/mock'
module Rails
module Configuration
@@ -38,7 +40,7 @@ module Rails
@stack.swap :foo
@stack.delete :foo
- mock = MiniTest::Mock.new
+ mock = Minitest::Mock.new
mock.expect :send, nil, [:swap, :foo]
mock.expect :send, nil, [:delete, :foo]
@@ -49,7 +51,7 @@ module Rails
private
def assert_playback(msg_name, args)
- mock = MiniTest::Mock.new
+ mock = Minitest::Mock.new
mock.expect :send, nil, [msg_name, args]
@stack.merge_into(mock)
mock.verify