From 7fc1edd790a3f590a81991d4582ab567de5a3de0 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sat, 25 Sep 2010 08:15:52 +0800 Subject: Remove deprecated stuff in ActionController This removes all deprecated classes in ActionController related to Routing, Abstract Request/Response and Integration/IntegrationTest. All tests and docs were changed to ActionDispatch instead of ActionController. --- actionpack/test/controller/routing_test.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'actionpack/test/controller/routing_test.rb') 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 -- cgit v1.2.3