diff options
author | Godfrey Chan <godfreykfc@gmail.com> | 2013-12-18 19:22:30 -0800 |
---|---|---|
committer | Godfrey Chan <godfreykfc@gmail.com> | 2013-12-18 19:22:30 -0800 |
commit | e63748cd3705896401ebac6e9f35bb9934d0547e (patch) | |
tree | f3fab34129963f1e16175dc71b97c6c10a986d50 /railties | |
parent | c454fc29a89e2e67ffc94de72062a189aed49b53 (diff) | |
parent | 7bae2921ec51335ec87fde1980a1b568ce37fc1c (diff) | |
download | rails-e63748cd3705896401ebac6e9f35bb9934d0547e.tar.gz rails-e63748cd3705896401ebac6e9f35bb9934d0547e.tar.bz2 rails-e63748cd3705896401ebac6e9f35bb9934d0547e.zip |
Merge pull request #13366 from vipulnsward/minitest-namespace-change
Change all `MiniTest` to `Minitest`
Diffstat (limited to 'railties')
-rw-r--r-- | railties/lib/rails/test_help.rb | 2 | ||||
-rw-r--r-- | railties/test/configuration/middleware_stack_proxy_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb index be801befc2..7765c9ae86 100644 --- a/railties/lib/rails/test_help.rb +++ b/railties/lib/rails/test_help.rb @@ -11,7 +11,7 @@ require 'rails/generators/test_case' # Config Rails backtrace in tests. require 'rails/backtrace_cleaner' if ENV["BACKTRACE"].nil? - MiniTest.backtrace_filter = Rails.backtrace_cleaner + Minitest.backtrace_filter = Rails.backtrace_cleaner end if defined?(ActiveRecord::Base) diff --git a/railties/test/configuration/middleware_stack_proxy_test.rb b/railties/test/configuration/middleware_stack_proxy_test.rb index 2442cb995d..6f3e45f320 100644 --- a/railties/test/configuration/middleware_stack_proxy_test.rb +++ b/railties/test/configuration/middleware_stack_proxy_test.rb @@ -39,7 +39,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] @@ -50,7 +50,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 |