diff options
29 files changed, 47 insertions, 58 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index e02578eafd..288f412caf 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -34,11 +34,6 @@ module ActionController autoload :UrlFor end - autoload :Integration, 'action_controller/deprecated/integration_test' - autoload :IntegrationTest, 'action_controller/deprecated/integration_test' - autoload :PerformanceTest, 'action_controller/deprecated/performance_test' - autoload :UrlWriter, 'action_controller/deprecated' - autoload :Routing, 'action_controller/deprecated' autoload :TestCase, 'action_controller/test_case' eager_autoload do diff --git a/actionpack/lib/action_controller/deprecated.rb b/actionpack/lib/action_controller/deprecated.rb deleted file mode 100644 index aa0cfc9395..0000000000 --- a/actionpack/lib/action_controller/deprecated.rb +++ /dev/null @@ -1,3 +0,0 @@ -ActionController::AbstractRequest = ActionController::Request = ActionDispatch::Request -ActionController::AbstractResponse = ActionController::Response = ActionDispatch::Response -ActionController::Routing = ActionDispatch::Routing
\ No newline at end of file diff --git a/actionpack/lib/action_controller/deprecated/integration_test.rb b/actionpack/lib/action_controller/deprecated/integration_test.rb deleted file mode 100644 index 86336b6bc4..0000000000 --- a/actionpack/lib/action_controller/deprecated/integration_test.rb +++ /dev/null @@ -1,2 +0,0 @@ -ActionController::Integration = ActionDispatch::Integration -ActionController::IntegrationTest = ActionDispatch::IntegrationTest diff --git a/actionpack/lib/action_controller/deprecated/performance_test.rb b/actionpack/lib/action_controller/deprecated/performance_test.rb deleted file mode 100644 index fcf47d31a7..0000000000 --- a/actionpack/lib/action_controller/deprecated/performance_test.rb +++ /dev/null @@ -1 +0,0 @@ -ActionController::PerformanceTest = ActionDispatch::PerformanceTest diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb index 251b1a8a8b..6a7e170306 100644 --- a/actionpack/lib/action_controller/metal/http_authentication.rb +++ b/actionpack/lib/action_controller/metal/http_authentication.rb @@ -417,7 +417,7 @@ module ActionController # Authorization: Token token="abc", nonce="def" # Then the returned token is "abc", and the options is {:nonce => "def"} # - # request - ActionController::Request instance with the current headers. + # request - ActionDispatch::Request instance with the current headers. # # Returns an Array of [String, Hash] if a token is present. # Returns nil if no token is found. diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 065152d01d..f5ae1c3fff 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -200,7 +200,7 @@ module ActionController # Superclass for ActionController functional tests. Functional tests allow you to # test a single controller action per test method. This should not be confused with - # integration tests (see ActionController::IntegrationTest), which are more like + # integration tests (see ActionDispatch::IntegrationTest), which are more like # "stories" that can involve multiple controllers and multiple actions (i.e. multiple # different HTTP requests). # diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb index aeec934be8..50faf666e6 100644 --- a/actionpack/lib/action_dispatch.rb +++ b/actionpack/lib/action_dispatch.rb @@ -85,6 +85,7 @@ module ActionDispatch autoload_under 'testing' do autoload :Assertions autoload :Integration + autoload :IntegrationTest, 'action_dispatch/testing/integration' autoload :PerformanceTest autoload :TestProcess autoload :TestRequest diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index a681c9a5b6..84039c06ab 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -385,7 +385,7 @@ module ActionDispatch # # require "test_helper" # - # class ExampleTest < ActionController::IntegrationTest + # class ExampleTest < ActionDispatch::IntegrationTest # fixtures :people # # def test_login @@ -409,7 +409,7 @@ module ActionDispatch # # require "test_helper" # - # class AdvancedTest < ActionController::IntegrationTest + # class AdvancedTest < ActionDispatch::IntegrationTest # fixtures :people, :rooms # # def test_login_and_speak diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 13f05651bc..3540af13ac 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -124,7 +124,7 @@ module ActiveSupport match ':controller(/:action)' end - ActionController::IntegrationTest.app.routes.draw do + ActionDispatch::IntegrationTest.app.routes.draw do match ':controller(/:action)' end end @@ -163,9 +163,7 @@ class ActionDispatch::IntegrationTest < ActiveSupport::TestCase setup do @routes = SharedTestRoutes end -end -class ActionController::IntegrationTest < ActiveSupport::TestCase def self.build_app(routes = nil) RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware| middleware.use "ActionDispatch::ShowExceptions" @@ -232,7 +230,7 @@ class ActionController::IntegrationTest < ActiveSupport::TestCase end # Temporary base class -class Rack::TestCase < ActionController::IntegrationTest +class Rack::TestCase < ActionDispatch::IntegrationTest def self.testing(klass = nil) if klass @testing = "/#{klass.name.underscore}".sub!(/_controller$/, '') diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb index dd43fa4810..f5811a1530 100644 --- a/actionpack/test/activerecord/active_record_store_test.rb +++ b/actionpack/test/activerecord/active_record_store_test.rb @@ -1,6 +1,6 @@ require 'active_record_unit' -class ActiveRecordStoreTest < ActionController::IntegrationTest +class ActiveRecordStoreTest < ActionDispatch::IntegrationTest class TestController < ActionController::Base def no_session_access head :ok diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb index d0fd9e8e46..cf4a461622 100644 --- a/actionpack/test/controller/filters_test.rb +++ b/actionpack/test/controller/filters_test.rb @@ -452,13 +452,14 @@ class FilterTest < ActionController::TestCase render :text => 'hello world' end end + def test_sweeper_should_not_block_rendering response = test_process(SweeperTestController) assert_equal 'hello world', response.body end def test_before_method_of_sweeper_should_always_return_true - sweeper = ActionController::Caching::Sweeper.send(:new) + sweeper = ActionController::Caching::Sweeper.send(:new) assert sweeper.before(TestController.new) end diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb index 6c411d8997..3569a2f213 100644 --- a/actionpack/test/controller/flash_test.rb +++ b/actionpack/test/controller/flash_test.rb @@ -209,7 +209,7 @@ class FlashTest < ActionController::TestCase end end -class FlashIntegrationTest < ActionController::IntegrationTest +class FlashIntegrationTest < ActionDispatch::IntegrationTest SessionKey = '_myapp_session' SessionSecret = 'b3c631c314c0bbca50c1b2843150fe33' diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index 343cffdf7f..4ff39fb76c 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -8,7 +8,7 @@ class SessionTest < Test::Unit::TestCase } def setup - @session = ActionController::Integration::Session.new(StubApp) + @session = ActionDispatch::Integration::Session.new(StubApp) end def test_https_bang_works_and_sets_truth_by_default @@ -167,7 +167,7 @@ end class IntegrationTestTest < Test::Unit::TestCase def setup - @test = ::ActionController::IntegrationTest.new(:default_test) + @test = ::ActionDispatch::IntegrationTest.new(:default_test) @test.class.stubs(:fixture_table_names).returns([]) @session = @test.open_session end @@ -202,7 +202,7 @@ end # Tests that integration tests don't call Controller test methods for processing. # Integration tests have their own setup and teardown. -class IntegrationTestUsesCorrectClass < ActionController::IntegrationTest +class IntegrationTestUsesCorrectClass < ActionDispatch::IntegrationTest def self.fixture_table_names [] end @@ -218,7 +218,7 @@ class IntegrationTestUsesCorrectClass < ActionController::IntegrationTest end end -class IntegrationProcessTest < ActionController::IntegrationTest +class IntegrationProcessTest < ActionDispatch::IntegrationTest class IntegrationController < ActionController::Base def get respond_to do |format| @@ -439,7 +439,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest end end -class MetalIntegrationTest < ActionController::IntegrationTest +class MetalIntegrationTest < ActionDispatch::IntegrationTest include SharedTestRoutes.url_helpers class Poller @@ -476,7 +476,7 @@ class MetalIntegrationTest < ActionController::IntegrationTest end end -class ApplicationIntegrationTest < ActionController::IntegrationTest +class ApplicationIntegrationTest < ActionDispatch::IntegrationTest class TestController < ActionController::Base def index render :text => "index" diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb index 04eedf3295..cefbc548c0 100644 --- a/actionpack/test/controller/rescue_test.rb +++ b/actionpack/test/controller/rescue_test.rb @@ -311,7 +311,7 @@ class RescueControllerTest < ActionController::TestCase end end -class RescueTest < ActionController::IntegrationTest +class RescueTest < ActionDispatch::IntegrationTest class TestController < ActionController::Base class RecordInvalid < StandardError def message diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index bb990586f7..ecfa13d4ba 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -10,12 +10,12 @@ class MilestonesController < ActionController::Base def rescue_action(e) raise e end end -ROUTING = ActionController::Routing +ROUTING = ActionDispatch::Routing # See RFC 3986, section 3.3 for allowed path characters. class UriReservedCharactersRoutingTest < Test::Unit::TestCase def setup - @set = ActionController::Routing::RouteSet.new + @set = ActionDispatch::Routing::RouteSet.new @set.draw do match ':controller/:action/:variable/*additional' end @@ -71,7 +71,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase attr_reader :rs def setup - @rs = ::ActionController::Routing::RouteSet.new + @rs = ::ActionDispatch::Routing::RouteSet.new end def teardown @@ -103,7 +103,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase def test_time_recognition # We create many routes to make situation more realistic - @rs = ::ActionController::Routing::RouteSet.new + @rs = ::ActionDispatch::Routing::RouteSet.new @rs.draw { root :to => "search#new", :as => "frontpage" resources :videos do @@ -581,7 +581,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase end def test_routes_changed_correctly_after_clear - rs = ::ActionController::Routing::RouteSet.new + rs = ::ActionDispatch::Routing::RouteSet.new rs.draw do match 'ca' => 'ca#aa' match 'cb' => 'cb#ab' @@ -1516,7 +1516,7 @@ class RackMountIntegrationTests < ActiveSupport::TestCase end match '/blog(/:year(/:month(/:day)))' => 'posts#show_date', - :constraints => { + :constraints => { :year => /(19|20)\d\d/, :month => /[01]?\d/, :day => /[0-3]?\d/ @@ -1559,7 +1559,7 @@ class RackMountIntegrationTests < ActiveSupport::TestCase } def setup - @routes = ActionController::Routing::RouteSet.new + @routes = ActionDispatch::Routing::RouteSet.new @routes.draw(&Mapping) end diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb index cd021c3b20..5564775a48 100644 --- a/actionpack/test/controller/webservice_test.rb +++ b/actionpack/test/controller/webservice_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' -class WebServiceTest < ActionController::IntegrationTest +class WebServiceTest < ActionDispatch::IntegrationTest class TestController < ActionController::Base def assign_parameters if params[:full] diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb index b6dee77203..34db7a4c66 100644 --- a/actionpack/test/dispatch/request/json_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' -class JsonParamsParsingTest < ActionController::IntegrationTest +class JsonParamsParsingTest < ActionDispatch::IntegrationTest class TestController < ActionController::Base class << self attr_accessor :last_request_parameters diff --git a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb index e701185b61..1ae514ebf7 100644 --- a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' -class MultipartParamsParsingTest < ActionController::IntegrationTest +class MultipartParamsParsingTest < ActionDispatch::IntegrationTest class TestController < ActionController::Base class << self attr_accessor :last_request_parameters diff --git a/actionpack/test/dispatch/request/query_string_parsing_test.rb b/actionpack/test/dispatch/request/query_string_parsing_test.rb index 8d67df433c..f6a1475d04 100644 --- a/actionpack/test/dispatch/request/query_string_parsing_test.rb +++ b/actionpack/test/dispatch/request/query_string_parsing_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' -class QueryStringParsingTest < ActionController::IntegrationTest +class QueryStringParsingTest < ActionDispatch::IntegrationTest class TestController < ActionController::Base class << self attr_accessor :last_query_parameters diff --git a/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb b/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb index b179f08f4e..04a0fb6f34 100644 --- a/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' -class UrlEncodedParamsParsingTest < ActionController::IntegrationTest +class UrlEncodedParamsParsingTest < ActionDispatch::IntegrationTest class TestController < ActionController::Base class << self attr_accessor :last_request_parameters, :last_request_type diff --git a/actionpack/test/dispatch/request/xml_params_parsing_test.rb b/actionpack/test/dispatch/request/xml_params_parsing_test.rb index 9d0695bf64..16669614d6 100644 --- a/actionpack/test/dispatch/request/xml_params_parsing_test.rb +++ b/actionpack/test/dispatch/request/xml_params_parsing_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' -class XmlParamsParsingTest < ActionController::IntegrationTest +class XmlParamsParsingTest < ActionDispatch::IntegrationTest class TestController < ActionController::Base class << self attr_accessor :last_request_parameters diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index 3daabf7a64..bdef04efc6 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -463,7 +463,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest end end - class TestAltApp < ActionController::IntegrationTest + class TestAltApp < ActionDispatch::IntegrationTest class AltRequest def initialize(env) @env = env @@ -2184,7 +2184,7 @@ private end end -class TestAppendingRoutes < ActionController::IntegrationTest +class TestAppendingRoutes < ActionDispatch::IntegrationTest def simple_app(resp) lambda { |e| [ 200, { 'Content-Type' => 'text/plain' }, [resp] ] } end @@ -2218,7 +2218,7 @@ class TestAppendingRoutes < ActionController::IntegrationTest end end -class TestDefaultScope < ActionController::IntegrationTest +class TestDefaultScope < ActionDispatch::IntegrationTest module ::Blog class PostsController < ActionController::Base def index diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb index dd580f0692..b436fb5518 100644 --- a/actionpack/test/dispatch/session/cookie_store_test.rb +++ b/actionpack/test/dispatch/session/cookie_store_test.rb @@ -1,7 +1,7 @@ require 'abstract_unit' require 'stringio' -class CookieStoreTest < ActionController::IntegrationTest +class CookieStoreTest < ActionDispatch::IntegrationTest SessionKey = '_myapp_session' SessionSecret = 'b3c631c314c0bbca50c1b2843150fe33' @@ -105,7 +105,7 @@ class CookieStoreTest < ActionController::IntegrationTest assert_equal 'foo: nil', response.body end end - + def test_does_not_set_secure_cookies_over_http with_test_route_set(:secure => true) do get '/set_session_value' @@ -113,7 +113,7 @@ class CookieStoreTest < ActionController::IntegrationTest assert_equal nil, headers['Set-Cookie'] end end - + def test_does_set_secure_cookies_over_https with_test_route_set(:secure => true) do get '/set_session_value', nil, 'HTTPS' => 'on' diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb index ab10d5fd3a..8502bc547b 100644 --- a/actionpack/test/dispatch/session/mem_cache_store_test.rb +++ b/actionpack/test/dispatch/session/mem_cache_store_test.rb @@ -1,7 +1,7 @@ require 'abstract_unit' # You need to start a memcached server inorder to run these tests -class MemCacheStoreTest < ActionController::IntegrationTest +class MemCacheStoreTest < ActionDispatch::IntegrationTest class TestController < ActionController::Base def no_session_access head :ok diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb index 4966527f4d..5b181600e8 100644 --- a/actionpack/test/dispatch/show_exceptions_test.rb +++ b/actionpack/test/dispatch/show_exceptions_test.rb @@ -14,7 +14,7 @@ module ActionDispatch end end -class ShowExceptionsTest < ActionController::IntegrationTest +class ShowExceptionsTest < ActionDispatch::IntegrationTest Boomer = lambda do |env| req = ActionDispatch::Request.new(env) case req.path diff --git a/railties/guides/source/testing.textile b/railties/guides/source/testing.textile index 2355d2a31a..043a2462b4 100644 --- a/railties/guides/source/testing.textile +++ b/railties/guides/source/testing.textile @@ -613,7 +613,7 @@ Here's what a freshly-generated integration test looks like: <ruby> require 'test_helper' -class UserFlowsTest < ActionController::IntegrationTest +class UserFlowsTest < ActionDispatch::IntegrationTest fixtures :all # Replace this with your real tests. @@ -623,7 +623,7 @@ class UserFlowsTest < ActionController::IntegrationTest end </ruby> -Integration tests inherit from +ActionController::IntegrationTest+. This makes available some additional helpers to use in your integration tests. Also you need to explicitly include the fixtures to be made available to the test. +Integration tests inherit from +ActionDispatch::IntegrationTest+. This makes available some additional helpers to use in your integration tests. Also you need to explicitly include the fixtures to be made available to the test. h4. Helpers Available for Integration Tests @@ -649,7 +649,7 @@ A simple integration test that exercises multiple controllers: <ruby> require 'test_helper' -class UserFlowsTest < ActionController::IntegrationTest +class UserFlowsTest < ActionDispatch::IntegrationTest fixtures :users test "login and browse site" do @@ -677,7 +677,7 @@ Here's an example of multiple sessions and custom DSL in an integration test <ruby> require 'test_helper' -class UserFlowsTest < ActionController::IntegrationTest +class UserFlowsTest < ActionDispatch::IntegrationTest fixtures :users test "login and browse site" do diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb index 7c1472147b..38f2f651f4 100644 --- a/railties/lib/rails/test_help.rb +++ b/railties/lib/rails/test_help.rb @@ -21,7 +21,7 @@ if defined?(ActiveRecord) self.fixture_path = "#{Rails.root}/test/fixtures/" end - ActionController::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path + ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path def create_fixtures(*table_names, &block) Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names, {}, &block) diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb index a72e6916dd..25b4a21902 100644 --- a/railties/test/application/console_test.rb +++ b/railties/test/application/console_test.rb @@ -17,14 +17,14 @@ class ConsoleTest < Test::Unit::TestCase load_environment console_session = app assert_not_nil console_session - assert_instance_of ActionController::Integration::Session, console_session + assert_instance_of ActionDispatch::Integration::Session, console_session end def test_new_session_should_return_integration_session load_environment session = new_session assert_not_nil session - assert_instance_of ActionController::Integration::Session, session + assert_instance_of ActionDispatch::Integration::Session, session end def test_reload_should_fire_preparation_callbacks diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb index de316a6fd0..1fbbb40132 100644 --- a/railties/test/application/test_test.rb +++ b/railties/test/application/test_test.rb @@ -53,7 +53,7 @@ module ApplicationTests app_file 'test/integration/posts_test.rb', <<-RUBY require 'test_helper' - class PostsTest < ActionController::IntegrationTest + class PostsTest < ActionDispatch::IntegrationTest def test_index get '/posts' assert_response :success |