aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/journey/router_test.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-08-14 18:04:49 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-08-14 18:06:48 -0700
commita293812bffbc6e634e1a6e6794e9dec537d522a3 (patch)
tree9fe55f6939904b9244599e625de58c77b62f1dbb /actionpack/test/journey/router_test.rb
parent09d846e7b81cb9e5ff891c91874b4108ce3156ec (diff)
downloadrails-a293812bffbc6e634e1a6e6794e9dec537d522a3.tar.gz
rails-a293812bffbc6e634e1a6e6794e9dec537d522a3.tar.bz2
rails-a293812bffbc6e634e1a6e6794e9dec537d522a3.zip
only keep one hash of named routes
The outer router object already keeps a hash of named routes, so we should just use that.
Diffstat (limited to 'actionpack/test/journey/router_test.rb')
-rw-r--r--actionpack/test/journey/router_test.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/actionpack/test/journey/router_test.rb b/actionpack/test/journey/router_test.rb
index bddfbe7ef0..8a1414de8e 100644
--- a/actionpack/test/journey/router_test.rb
+++ b/actionpack/test/journey/router_test.rb
@@ -8,9 +8,10 @@ module ActionDispatch
def setup
@app = Routing::RouteSet::Dispatcher.new({})
- @routes = Routes.new
- @router = Router.new(@routes)
- @formatter = Formatter.new(@routes)
+ @route_set = ActionDispatch::Routing::RouteSet.new
+ @routes = @route_set.router.routes
+ @router = @route_set.router
+ @formatter = @route_set.formatter
end
class FakeRequestFeeler < ActionDispatch::Request
@@ -184,8 +185,8 @@ module ActionDispatch
def test_knows_what_parts_are_missing_from_named_route
route_name = "gorby_thunderhorse"
- path = Path::Pattern.build("/foo/:id", { :id => /\d+/ }, ['/', '.', '?'], false)
- add_route nil, path, {}, [], {}, route_name
+ mapper = ActionDispatch::Routing::Mapper.new @route_set
+ mapper.get "/foo/:id", :as => route_name, :id => /\d+/, :to => "foo#bar"
error = assert_raises(ActionController::UrlGenerationError) do
@formatter.generate(route_name, { }, { })