diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-09 09:34:36 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-09 09:34:36 -0800 |
| commit | d8516d702c1cf5ee633b73b54189c12c934ebdd8 (patch) | |
| tree | f866a4fd6afaf3cd5c0a435547783ed526f896e5 /actionpack/lib | |
| parent | 7cfd1bd76a41bea528c945d821a9fbc3902af479 (diff) | |
| parent | 22a8c2a900ebabb38f07ad0945a922acf3cfbf6f (diff) | |
| download | rails-d8516d702c1cf5ee633b73b54189c12c934ebdd8.tar.gz rails-d8516d702c1cf5ee633b73b54189c12c934ebdd8.tar.bz2 rails-d8516d702c1cf5ee633b73b54189c12c934ebdd8.zip | |
Merge pull request #4371 from rafaelfranca/test_unit_cleanup
Test unit cleanup
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index ed402f5f4d..d09d3d844b 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -431,7 +431,7 @@ module ActionController def process(action, http_method = 'GET', *args) check_required_ivars - http_method, args = handle_old_process_api(http_method, args) + http_method, args = handle_old_process_api(http_method, args) if args.first.is_a?(String) @request.env['RAW_POST_DATA'] = args.shift diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 26db8662a8..08b7ff49c2 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -4,7 +4,6 @@ require 'active_support/core_ext/kernel/singleton_class' require 'active_support/core_ext/object/inclusion' require 'active_support/core_ext/object/try' require 'rack/test' -require 'test/unit/assertions' module ActionDispatch module Integration #:nodoc: @@ -127,7 +126,7 @@ module ActionDispatch class Session DEFAULT_HOST = "www.example.com" - include Test::Unit::Assertions + include MiniTest::Assertions include TestProcess, RequestHelpers, Assertions %w( status status_message headers body redirect? ).each do |method| |