diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-04-30 11:55:53 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-04-30 11:55:53 -0500 |
commit | 7b3b7cb2ab1ccf96d4c8a1bafd87dbfbd2ac8c84 (patch) | |
tree | 7bc9e3436b8daf7552cd7c08380cf0a6554158db /actionpack/lib/action_controller/testing/test_case.rb | |
parent | 98dd726687259b96fad15cc073c610fda7fc1023 (diff) | |
download | rails-7b3b7cb2ab1ccf96d4c8a1bafd87dbfbd2ac8c84.tar.gz rails-7b3b7cb2ab1ccf96d4c8a1bafd87dbfbd2ac8c84.tar.bz2 rails-7b3b7cb2ab1ccf96d4c8a1bafd87dbfbd2ac8c84.zip |
Move generic assertions into ActionDispatch
Diffstat (limited to 'actionpack/lib/action_controller/testing/test_case.rb')
-rw-r--r-- | actionpack/lib/action_controller/testing/test_case.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/testing/test_case.rb b/actionpack/lib/action_controller/testing/test_case.rb index a80488e13e..7b4eda58e5 100644 --- a/actionpack/lib/action_controller/testing/test_case.rb +++ b/actionpack/lib/action_controller/testing/test_case.rb @@ -105,12 +105,7 @@ module ActionController class TestCase < ActiveSupport::TestCase include TestProcess - module Assertions - %w(response selector tag dom routing model).each do |kind| - include ActionController::Assertions.const_get("#{kind.camelize}Assertions") - end - end - include Assertions + include ActionDispatch::Assertions # When the request.remote_addr remains the default for testing, which is 0.0.0.0, the exception is simply raised inline # (bystepping the regular exception handling from rescue_action). If the request.remote_addr is anything else, the regular |