aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/routing_test.rb
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2010-09-25 08:15:52 +0800
committerJosé Valim <jose.valim@gmail.com>2010-09-26 02:13:45 +0800
commit7fc1edd790a3f590a81991d4582ab567de5a3de0 (patch)
tree2e824123d5b02c050119127e45a522a94196e42d /actionpack/test/controller/routing_test.rb
parentff3f55ee583743abf03a75d221216614e7ccd5e8 (diff)
downloadrails-7fc1edd790a3f590a81991d4582ab567de5a3de0.tar.gz
rails-7fc1edd790a3f590a81991d4582ab567de5a3de0.tar.bz2
rails-7fc1edd790a3f590a81991d4582ab567de5a3de0.zip
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.
Diffstat (limited to 'actionpack/test/controller/routing_test.rb')
-rw-r--r--actionpack/test/controller/routing_test.rb14
1 files changed, 7 insertions, 7 deletions
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