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 /actionpack/lib | |
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 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_dispatch/testing/assertions/routing.rb | 2 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb index 496682e8bd..f1f998d932 100644 --- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb +++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb @@ -211,7 +211,7 @@ module ActionDispatch def fail_on(exception_class) yield rescue exception_class => e - raise MiniTest::Assertion, e.message + raise Minitest::Assertion, e.message end end end diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 9beb30307b..57ccb18452 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -137,7 +137,7 @@ module ActionDispatch class Session DEFAULT_HOST = "www.example.com" - include MiniTest::Assertions + include Minitest::Assertions include TestProcess, RequestHelpers, Assertions %w( status status_message headers body redirect? ).each do |method| |