From 1ce74b009f0a5bbb9e5f5fe1c037c77437fd0be9 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 17 Aug 2015 16:07:39 -0700
Subject: introduce an alternate constructor for Route objects

I want to change the real constructor to take a particular parameter for
matching the request method
---
 actionpack/test/journey/route_test.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'actionpack/test/journey/route_test.rb')

diff --git a/actionpack/test/journey/route_test.rb b/actionpack/test/journey/route_test.rb
index 75e41193b4..dcb82a6741 100644
--- a/actionpack/test/journey/route_test.rb
+++ b/actionpack/test/journey/route_test.rb
@@ -7,7 +7,7 @@ module ActionDispatch
         app      = Object.new
         path     = Path::Pattern.from_string '/:controller(/:action(/:id(.:format)))'
         defaults = {}
-        route    = Route.new("name", app, path, {}, [], defaults)
+        route    = Route.build("name", app, path, {}, [], defaults)
 
         assert_equal app, route.app
         assert_equal path, route.path
@@ -18,7 +18,7 @@ module ActionDispatch
         app      = Object.new
         path     = Path::Pattern.from_string '/:controller(/:action(/:id(.:format)))'
         defaults = {}
-        route    = Route.new("name", app, path, {}, [], defaults)
+        route    = Route.build("name", app, path, {}, [], defaults)
 
         route.ast.grep(Nodes::Terminal).each do |node|
           assert_equal route, node.memo
@@ -28,27 +28,27 @@ module ActionDispatch
       def test_path_requirements_override_defaults
         path    = Path::Pattern.build(':name', { name: /love/ }, '/', true)
         defaults  = { name: 'tender' }
-        route     = Route.new('name', nil, path, nil, [], defaults)
+        route     = Route.build('name', nil, path, nil, [], defaults)
         assert_equal(/love/, route.requirements[:name])
       end
 
       def test_ip_address
         path  = Path::Pattern.from_string '/messages/:id(.:format)'
-        route = Route.new("name", nil, path, {:ip => '192.168.1.1'}, [],
+        route = Route.build("name", nil, path, {:ip => '192.168.1.1'}, [],
                           { :controller => 'foo', :action => 'bar' })
         assert_equal '192.168.1.1', route.ip
       end
 
       def test_default_ip
         path  = Path::Pattern.from_string '/messages/:id(.:format)'
-        route = Route.new("name", nil, path, {}, [],
+        route = Route.build("name", nil, path, {}, [],
                           { :controller => 'foo', :action => 'bar' })
         assert_equal(//, route.ip)
       end
 
       def test_format_with_star
         path  = Path::Pattern.from_string '/:controller/*extra'
-        route = Route.new("name", nil, path, {}, [],
+        route = Route.build("name", nil, path, {}, [],
                           { :controller => 'foo', :action => 'bar' })
         assert_equal '/foo/himom', route.format({
           :controller => 'foo',
@@ -58,7 +58,7 @@ module ActionDispatch
 
       def test_connects_all_match
         path  = Path::Pattern.from_string '/:controller(/:action(/:id(.:format)))'
-        route = Route.new("name", nil, path, {:action => 'bar'}, [], { :controller => 'foo' })
+        route = Route.build("name", nil, path, {:action => 'bar'}, [], { :controller => 'foo' })
 
         assert_equal '/foo/bar/10', route.format({
           :controller => 'foo',
@@ -69,21 +69,21 @@ module ActionDispatch
 
       def test_extras_are_not_included_if_optional
         path  = Path::Pattern.from_string '/page/:id(/:action)'
-        route = Route.new("name", nil, path, { }, [], { :action => 'show' })
+        route = Route.build("name", nil, path, { }, [], { :action => 'show' })
 
         assert_equal '/page/10', route.format({ :id => 10 })
       end
 
       def test_extras_are_not_included_if_optional_with_parameter
         path  = Path::Pattern.from_string '(/sections/:section)/pages/:id'
-        route = Route.new("name", nil, path, { }, [], { :action => 'show' })
+        route = Route.build("name", nil, path, { }, [], { :action => 'show' })
 
         assert_equal '/pages/10', route.format({:id => 10})
       end
 
       def test_extras_are_not_included_if_optional_parameter_is_nil
         path  = Path::Pattern.from_string '(/sections/:section)/pages/:id'
-        route = Route.new("name", nil, path, { }, [], { :action => 'show' })
+        route = Route.build("name", nil, path, { }, [], { :action => 'show' })
 
         assert_equal '/pages/10', route.format({:id => 10, :section => nil})
       end
@@ -93,10 +93,10 @@ module ActionDispatch
         defaults = {:controller=>"pages", :action=>"show"}
 
         path = Path::Pattern.from_string "/page/:id(/:action)(.:format)"
-        specific = Route.new "name", nil, path, constraints, [:controller, :action], defaults
+        specific = Route.build "name", nil, path, constraints, [:controller, :action], defaults
 
         path = Path::Pattern.from_string "/:controller(/:action(/:id))(.:format)"
-        generic = Route.new "name", nil, path, constraints, [], {}
+        generic = Route.build "name", nil, path, constraints, [], {}
 
         knowledge = {:id=>20, :controller=>"pages", :action=>"show"}
 
-- 
cgit v1.2.3