aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/test_test.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-07-28 13:41:42 -0500
committerJoshua Peek <josh@joshpeek.com>2008-07-28 13:41:42 -0500
commita5db1488251304ec93256654859b430148f0c506 (patch)
tree92b454caa321d55365710eb02696c071135b6dd9 /actionpack/test/controller/test_test.rb
parente0513e33c4da60255e7c1aa71babcc9414f26858 (diff)
downloadrails-a5db1488251304ec93256654859b430148f0c506.tar.gz
rails-a5db1488251304ec93256654859b430148f0c506.tar.bz2
rails-a5db1488251304ec93256654859b430148f0c506.zip
Prepare Route#generate and Route#recognize early. Also refactor segments a bit to try to make immutable.
Diffstat (limited to 'actionpack/test/controller/test_test.rb')
-rw-r--r--actionpack/test/controller/test_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 61b8c83ee0..58d9ca537f 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -117,8 +117,8 @@ XML
@controller = TestController.new
@request = ActionController::TestRequest.new
@response = ActionController::TestResponse.new
- ActionController::Routing::Routes.reload
ActionController::Routing.use_controllers! %w(content admin/user test_test/test)
+ ActionController::Routing::Routes.load_routes!
end
def teardown
@@ -412,7 +412,7 @@ XML
def test_assert_routing_with_method
with_routing do |set|
- set.draw { |map| map.resources(:content) }
+ set.draw { |map| map.resources(:content) }
assert_routing({ :method => 'post', :path => 'content' }, { :controller => 'content', :action => 'create' })
end
end