diff options
Diffstat (limited to 'actionpack/test/controller/routing_test.rb')
| -rw-r--r-- | actionpack/test/controller/routing_test.rb | 812 |
1 files changed, 406 insertions, 406 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index f8a3d7cd5b..7d506c1976 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -30,28 +30,28 @@ class UriReservedCharactersRoutingTest < ActiveSupport::TestCase def test_route_generation_escapes_unsafe_path_characters assert_equal "/content/act#{@escaped}ion/var#{@escaped}iable/add#{@escaped}itional-1/add#{@escaped}itional-2", url_for(@set, { - :controller => "content", - :action => "act#{@segment}ion", - :variable => "var#{@segment}iable", - :additional => ["add#{@segment}itional-1", "add#{@segment}itional-2"] + controller: "content", + action: "act#{@segment}ion", + variable: "var#{@segment}iable", + additional: ["add#{@segment}itional-1", "add#{@segment}itional-2"] }) end def test_route_recognition_unescapes_path_components - options = { :controller => "content", - :action => "act#{@segment}ion", - :variable => "var#{@segment}iable", - :additional => "add#{@segment}itional-1/add#{@segment}itional-2" } + options = { controller: "content", + action: "act#{@segment}ion", + variable: "var#{@segment}iable", + additional: "add#{@segment}itional-1/add#{@segment}itional-2" } assert_equal options, @set.recognize_path("/content/act#{@escaped}ion/var#{@escaped}iable/add#{@escaped}itional-1/add#{@escaped}itional-2") end def test_route_generation_allows_passing_non_string_values_to_generated_helper assert_equal "/content/action/variable/1/2", url_for(@set, { - :controller => "content", - :action => "action", - :variable => "variable", - :additional => [1, 2] + controller: "content", + action: "action", + variable: "variable", + additional: [1, 2] }) end end @@ -86,7 +86,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_symbols_with_dashes rs.draw do - get "/:artist/:song-omg", :to => lambda { |env| + get "/:artist/:song-omg", to: lambda { |env| resp = ActiveSupport::JSON.encode ActionDispatch::Request.new(env).path_parameters [200, {}, [resp]] } @@ -98,7 +98,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_id_with_dash rs.draw do - get "/journey/:id", :to => lambda { |env| + get "/journey/:id", to: lambda { |env| resp = ActiveSupport::JSON.encode ActionDispatch::Request.new(env).path_parameters [200, {}, [resp]] } @@ -110,7 +110,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_dash_with_custom_regexp rs.draw do - get "/:artist/:song-omg", :constraints => { :song => /\d+/ }, :to => lambda { |env| + get "/:artist/:song-omg", constraints: { song: /\d+/ }, to: lambda { |env| resp = ActiveSupport::JSON.encode ActionDispatch::Request.new(env).path_parameters [200, {}, [resp]] } @@ -123,7 +123,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_pre_dash rs.draw do - get "/:artist/omg-:song", :to => lambda { |env| + get "/:artist/omg-:song", to: lambda { |env| resp = ActiveSupport::JSON.encode ActionDispatch::Request.new(env).path_parameters [200, {}, [resp]] } @@ -135,7 +135,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_pre_dash_with_custom_regexp rs.draw do - get "/:artist/omg-:song", :constraints => { :song => /\d+/ }, :to => lambda { |env| + get "/:artist/omg-:song", constraints: { song: /\d+/ }, to: lambda { |env| resp = ActiveSupport::JSON.encode ActionDispatch::Request.new(env).path_parameters [200, {}, [resp]] } @@ -148,10 +148,10 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_star_paths_are_greedy rs.draw do - get "/*path", :to => lambda { |env| + get "/*path", to: lambda { |env| x = env["action_dispatch.request.path_parameters"][:path] [200, {}, [x]] - }, :format => false + }, format: false end u = URI("http://example.org/foo/bar.html") @@ -160,7 +160,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_star_paths_are_greedy_but_not_too_much rs.draw do - get "/*path", :to => lambda { |env| + get "/*path", to: lambda { |env| x = ActiveSupport::JSON.encode env["action_dispatch.request.path_parameters"] [200, {}, [x]] } @@ -173,10 +173,10 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_optional_star_paths_are_greedy rs.draw do - get "/(*filters)", :to => lambda { |env| + get "/(*filters)", to: lambda { |env| x = env["action_dispatch.request.path_parameters"][:filters] [200, {}, [x]] - }, :format => false + }, format: false end u = URI("http://example.org/ne_27.065938,-80.6092/sw_25.489856,-82.542794") @@ -185,7 +185,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_optional_star_paths_are_greedy_but_not_too_much rs.draw do - get "/(*filters)", :to => lambda { |env| + get "/(*filters)", to: lambda { |env| x = ActiveSupport::JSON.encode env["action_dispatch.request.path_parameters"] [200, {}, [x]] } @@ -199,11 +199,11 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_regexp_precidence rs.draw do - get "/whois/:domain", :constraints => { - :domain => /\w+\.[\w\.]+/ }, - :to => lambda { |env| [200, {}, %w{regexp}] } + get "/whois/:domain", constraints: { + domain: /\w+\.[\w\.]+/ }, + to: lambda { |env| [200, {}, %w{regexp}] } - get "/whois/:id", :to => lambda { |env| [200, {}, %w{id}] } + get "/whois/:id", to: lambda { |env| [200, {}, %w{id}] } end assert_equal "regexp", get(URI("http://example.org/whois/example.org")) @@ -218,10 +218,10 @@ class LegacyRouteSetTests < ActiveSupport::TestCase } rs.draw do - get "/", :constraints => subdomain.new, - :to => lambda { |env| [200, {}, %w{default}] } - get "/", :constraints => { :subdomain => "clients" }, - :to => lambda { |env| [200, {}, %w{clients}] } + get "/", constraints: subdomain.new, + to: lambda { |env| [200, {}, %w{default}] } + get "/", constraints: { subdomain: "clients" }, + to: lambda { |env| [200, {}, %w{clients}] } end assert_equal "default", get(URI("http://www.example.org/")) @@ -230,13 +230,13 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_lambda_constraints rs.draw do - get "/", :constraints => lambda { |req| + get "/", constraints: lambda { |req| req.subdomain.present? and req.subdomain != "clients" }, - :to => lambda { |env| [200, {}, %w{default}] } + to: lambda { |env| [200, {}, %w{default}] } - get "/", :constraints => lambda { |req| + get "/", constraints: lambda { |req| req.subdomain.present? && req.subdomain == "clients" }, - :to => lambda { |env| [200, {}, %w{clients}] } + to: lambda { |env| [200, {}, %w{clients}] } end assert_equal "default", get(URI("http://www.example.org/")) @@ -246,8 +246,8 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_scoped_lambda scope_called = false rs.draw do - scope "/foo", :constraints => lambda { |req| scope_called = true } do - get "/", :to => lambda { |env| [200, {}, %w{default}] } + scope "/foo", constraints: lambda { |req| scope_called = true } do + get "/", to: lambda { |env| [200, {}, %w{default}] } end end @@ -259,9 +259,9 @@ class LegacyRouteSetTests < ActiveSupport::TestCase inner_called = false rs.draw do - scope "/foo", :constraints => lambda { |req| flunk "should not be called" } do - get "/", :constraints => lambda { |req| inner_called = true }, - :to => lambda { |env| [200, {}, %w{default}] } + scope "/foo", constraints: lambda { |req| flunk "should not be called" } do + get "/", constraints: lambda { |req| inner_called = true }, + to: lambda { |env| [200, {}, %w{default}] } end end @@ -271,8 +271,8 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_empty_string_match rs.draw do - get "/:username", :constraints => { :username => /[^\/]+/ }, - :to => lambda { |e| [200, {}, ["foo"]] } + get "/:username", constraints: { username: /[^\/]+/ }, + to: lambda { |e| [200, {}, ["foo"]] } end assert_equal "Not Found", get(URI("http://example.org/")) assert_equal "foo", get(URI("http://example.org/hello")) @@ -281,14 +281,14 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_non_greedy_glob_regexp params = nil rs.draw do - get "/posts/:id(/*filters)", :constraints => { :filters => /.+?/ }, - :to => lambda { |e| + get "/posts/:id(/*filters)", constraints: { filters: /.+?/ }, + to: lambda { |e| params = e["action_dispatch.request.path_parameters"] [200, {}, ["foo"]] } end assert_equal "foo", get(URI("http://example.org/posts/1/foo.js")) - assert_equal({:id=>"1", :filters=>"foo", :format=>"js"}, params) + assert_equal({id: "1", filters: "foo", format: "js"}, params) end def test_specific_controller_action_failure @@ -297,30 +297,30 @@ class LegacyRouteSetTests < ActiveSupport::TestCase end assert_raises(ActionController::UrlGenerationError) do - url_for(rs, :controller => "omg", :action => "lol") + url_for(rs, controller: "omg", action: "lol") end end def test_default_setup rs.draw { ActiveSupport::Deprecation.silence { get "/:controller(/:action(/:id))" } } - assert_equal({:controller => "content", :action => "index"}, rs.recognize_path("/content")) - assert_equal({:controller => "content", :action => "list"}, rs.recognize_path("/content/list")) - assert_equal({:controller => "content", :action => "show", :id => "10"}, rs.recognize_path("/content/show/10")) + assert_equal({controller: "content", action: "index"}, rs.recognize_path("/content")) + assert_equal({controller: "content", action: "list"}, rs.recognize_path("/content/list")) + assert_equal({controller: "content", action: "show", id: "10"}, rs.recognize_path("/content/show/10")) - assert_equal({:controller => "admin/user", :action => "show", :id => "10"}, rs.recognize_path("/admin/user/show/10")) + assert_equal({controller: "admin/user", action: "show", id: "10"}, rs.recognize_path("/admin/user/show/10")) - assert_equal "/admin/user/show/10", url_for(rs, { :controller => "admin/user", :action => "show", :id => 10 }) + assert_equal "/admin/user/show/10", url_for(rs, { controller: "admin/user", action: "show", id: 10 }) get URI("http://test.host/admin/user/list/10") - assert_equal({ :controller => "admin/user", :action => "list", :id => "10" }, + assert_equal({ controller: "admin/user", action: "list", id: "10" }, controller.request.path_parameters) - assert_equal "/admin/user/show", controller.url_for({ :action => "show", :only_path => true }) - assert_equal "/admin/user/list/10", controller.url_for({:only_path => true}) + assert_equal "/admin/user/show", controller.url_for({ action: "show", only_path: true }) + assert_equal "/admin/user/list/10", controller.url_for({only_path: true}) - assert_equal "/admin/stuff", controller.url_for({ :controller => "stuff", :only_path => true }) - assert_equal "/stuff", controller.url_for({ :controller => "/stuff", :only_path => true }) + assert_equal "/admin/stuff", controller.url_for({ controller: "stuff", only_path: true }) + assert_equal "/stuff", controller.url_for({ controller: "/stuff", only_path: true }) end def test_route_with_colon_first @@ -348,28 +348,28 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_route_with_regexp_for_controller rs.draw do ActiveSupport::Deprecation.silence do - get ":controller/:admintoken(/:action(/:id))", :controller => /admin\/.+/ + get ":controller/:admintoken(/:action(/:id))", controller: /admin\/.+/ get "/:controller(/:action(/:id))" end end - assert_equal({:controller => "admin/user", :admintoken => "foo", :action => "index"}, + assert_equal({controller: "admin/user", admintoken: "foo", action: "index"}, rs.recognize_path("/admin/user/foo")) - assert_equal({:controller => "content", :action => "foo"}, + assert_equal({controller: "content", action: "foo"}, rs.recognize_path("/content/foo")) - assert_equal "/admin/user/foo", url_for(rs, { :controller => "admin/user", :admintoken => "foo", :action => "index" }) - assert_equal "/content/foo", url_for(rs, { :controller => "content", :action => "foo" }) + assert_equal "/admin/user/foo", url_for(rs, { controller: "admin/user", admintoken: "foo", action: "index" }) + assert_equal "/content/foo", url_for(rs, { controller: "content", action: "foo" }) end def test_route_with_regexp_and_captures_for_controller rs.draw do ActiveSupport::Deprecation.silence do - get "/:controller(/:action(/:id))", :controller => /admin\/(accounts|users)/ + get "/:controller(/:action(/:id))", controller: /admin\/(accounts|users)/ end end - assert_equal({:controller => "admin/accounts", :action => "index"}, rs.recognize_path("/admin/accounts")) - assert_equal({:controller => "admin/users", :action => "index"}, rs.recognize_path("/admin/users")) + assert_equal({controller: "admin/accounts", action: "index"}, rs.recognize_path("/admin/accounts")) + assert_equal({controller: "admin/users", action: "index"}, rs.recognize_path("/admin/users")) assert_raise(ActionController::RoutingError) { rs.recognize_path("/admin/products") } end @@ -377,30 +377,30 @@ class LegacyRouteSetTests < ActiveSupport::TestCase rs.draw do ActiveSupport::Deprecation.silence do get ":controller/:action/:file", - :controller => /admin|user/, - :action => /upload|download/, - :defaults => {:file => nil}, - :constraints => {:file => %r{[^/]+(\.[^/]+)?}} + controller: /admin|user/, + action: /upload|download/, + defaults: {file: nil}, + constraints: {file: %r{[^/]+(\.[^/]+)?}} end end # Without a file extension assert_equal "/user/download/file", - url_for(rs, { :controller => "user", :action => "download", :file => "file" }) + url_for(rs, { controller: "user", action: "download", file: "file" }) - assert_equal({:controller => "user", :action => "download", :file => "file"}, + assert_equal({controller: "user", action: "download", file: "file"}, rs.recognize_path("/user/download/file")) # Now, let's try a file with an extension, really a dot (.) assert_equal "/user/download/file.jpg", - url_for(rs, { :controller => "user", :action => "download", :file => "file.jpg" }) + url_for(rs, { controller: "user", action: "download", file: "file.jpg" }) - assert_equal({:controller => "user", :action => "download", :file => "file.jpg"}, + assert_equal({controller: "user", action: "download", file: "file.jpg"}, rs.recognize_path("/user/download/file.jpg")) end def test_basic_named_route rs.draw do - root :to => "content#list", :as => "home" + root to: "content#list", as: "home" end assert_equal("http://test.host/", setup_for_named_route.send(:home_url)) end @@ -411,7 +411,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase end assert_equal("http://test.host/page/new%20stuff", - setup_for_named_route.send(:page_url, :title => "new stuff")) + setup_for_named_route.send(:page_url, title: "new stuff")) end def test_named_route_with_default @@ -420,7 +420,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase end assert_equal("http://test.host/page/AboutRails", - setup_for_named_route.send(:page_url, :title => "AboutRails")) + setup_for_named_route.send(:page_url, title: "AboutRails")) end def test_named_route_with_path_prefix @@ -469,14 +469,14 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_named_route_without_hash rs.draw do ActiveSupport::Deprecation.silence do - get ":controller/:action/:id", :as => "normal" + get ":controller/:action/:id", as: "normal" end end end def test_named_route_root rs.draw do - root :to => "hello#index" + root to: "hello#index" end routes = setup_for_named_route assert_equal("http://test.host/", routes.send(:root_url)) @@ -531,7 +531,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase routes = setup_for_named_route assert_equal "http://test.host/page/2005/6/10/hi", - routes.send(:article_url, :title => "hi", :day => 10, :year => 2005, :month => 6) + routes.send(:article_url, title: "hi", day: 10, year: 2005, month: 6) end def test_changing_controller @@ -540,7 +540,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase get URI("http://test.host/admin/user/index/10") assert_equal "/admin/stuff/show/10", - controller.url_for({:controller => "stuff", :action => "show", :id => 10, :only_path => true}) + controller.url_for({controller: "stuff", action: "show", id: 10, only_path: true}) end def test_paths_escaped @@ -583,10 +583,10 @@ class LegacyRouteSetTests < ActiveSupport::TestCase def test_should_list_options_diff_when_routing_constraints_dont_match rs.draw do - get "post/:id" => "post#show", :constraints => { :id => /\d+/ }, :as => "post" + get "post/:id" => "post#show", :constraints => { id: /\d+/ }, :as => "post" end assert_raise(ActionController::UrlGenerationError) do - url_for(rs, { :controller => "post", :action => "show", :bad_param => "foo", :use_route => "post" }) + url_for(rs, { controller: "post", action: "show", bad_param: "foo", use_route: "post" }) end end @@ -596,7 +596,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase end assert_equal "/pages/boo", - url_for(rs, { :controller => "content", :action => "show_file", :path => %w(pages boo) }) + url_for(rs, { controller: "content", action: "show_file", path: %w(pages boo) }) end def test_dynamic_recall_paths_allowed @@ -605,11 +605,11 @@ class LegacyRouteSetTests < ActiveSupport::TestCase end get URI("http://test.host/pages/boo") - assert_equal({:controller=>"content", :action=>"show_file", :path=>"pages/boo"}, + assert_equal({controller: "content", action: "show_file", path: "pages/boo"}, controller.request.path_parameters) assert_equal "/pages/boo", - controller.url_for(:only_path => true) + controller.url_for(only_path: true) end def test_backwards @@ -621,9 +621,9 @@ class LegacyRouteSetTests < ActiveSupport::TestCase end get URI("http://test.host/pages/show") - assert_equal "/page/20", controller.url_for({ :id => 20, :only_path => true }) - assert_equal "/page/20", url_for(rs, { :controller => "pages", :id => 20, :action => "show" }) - assert_equal "/pages/boo", url_for(rs, { :controller => "pages", :action => "boo" }) + assert_equal "/page/20", controller.url_for({ id: 20, only_path: true }) + assert_equal "/page/20", url_for(rs, { controller: "pages", id: 20, action: "show" }) + assert_equal "/pages/boo", url_for(rs, { controller: "pages", action: "boo" }) end def test_route_with_integer_default @@ -635,14 +635,14 @@ class LegacyRouteSetTests < ActiveSupport::TestCase end end - assert_equal "/page", url_for(rs, { :controller => "content", :action => "show_page" }) - assert_equal "/page", url_for(rs, { :controller => "content", :action => "show_page", :id => 1 }) - assert_equal "/page", url_for(rs, { :controller => "content", :action => "show_page", :id => "1" }) - assert_equal "/page/10", url_for(rs, { :controller => "content", :action => "show_page", :id => 10 }) + assert_equal "/page", url_for(rs, { controller: "content", action: "show_page" }) + assert_equal "/page", url_for(rs, { controller: "content", action: "show_page", id: 1 }) + assert_equal "/page", url_for(rs, { controller: "content", action: "show_page", id: "1" }) + assert_equal "/page/10", url_for(rs, { controller: "content", action: "show_page", id: 10 }) - assert_equal({:controller => "content", :action => "show_page", :id => 1 }, rs.recognize_path("/page")) - assert_equal({:controller => "content", :action => "show_page", :id => "1"}, rs.recognize_path("/page/1")) - assert_equal({:controller => "content", :action => "show_page", :id => "10"}, rs.recognize_path("/page/10")) + assert_equal({controller: "content", action: "show_page", id: 1 }, rs.recognize_path("/page")) + assert_equal({controller: "content", action: "show_page", id: "1"}, rs.recognize_path("/page/1")) + assert_equal({controller: "content", action: "show_page", id: "10"}, rs.recognize_path("/page/10")) end # For newer revision @@ -655,40 +655,40 @@ class LegacyRouteSetTests < ActiveSupport::TestCase end end - assert_equal "/page/foo", url_for(rs, { :controller => "content", :action => "show_page", :id => "foo" }) - assert_equal({ :controller => "content", :action => "show_page", :id => "foo" }, rs.recognize_path("/page/foo")) + assert_equal "/page/foo", url_for(rs, { controller: "content", action: "show_page", id: "foo" }) + assert_equal({ controller: "content", action: "show_page", id: "foo" }, rs.recognize_path("/page/foo")) token = "\321\202\320\265\320\272\321\201\321\202" # 'text' in Russian token.force_encoding(Encoding::BINARY) escaped_token = CGI::escape(token) - assert_equal "/page/" + escaped_token, url_for(rs, { :controller => "content", :action => "show_page", :id => token }) - assert_equal({ :controller => "content", :action => "show_page", :id => token }, rs.recognize_path("/page/#{escaped_token}")) + assert_equal "/page/" + escaped_token, url_for(rs, { controller: "content", action: "show_page", id: token }) + assert_equal({ controller: "content", action: "show_page", id: token }, rs.recognize_path("/page/#{escaped_token}")) end def test_action_expiry rs.draw { ActiveSupport::Deprecation.silence { get ":controller(/:action(/:id))" } } get URI("http://test.host/content/show") - assert_equal "/content", controller.url_for(:controller => "content", :only_path => true) + assert_equal "/content", controller.url_for(controller: "content", only_path: true) end def test_requirement_should_prevent_optional_id rs.draw do - get "post/:id" => "post#show", :constraints => {:id => /\d+/}, :as => "post" + get "post/:id" => "post#show", :constraints => {id: /\d+/}, :as => "post" end - assert_equal "/post/10", url_for(rs, { :controller => "post", :action => "show", :id => 10 }) + assert_equal "/post/10", url_for(rs, { controller: "post", action: "show", id: 10 }) assert_raise(ActionController::UrlGenerationError) do - url_for(rs, { :controller => "post", :action => "show" }) + url_for(rs, { controller: "post", action: "show" }) end end def test_both_requirement_and_optional rs.draw do get("test(/:year)" => "post#show", :as => "blog", - :defaults => { :year => nil }, - :constraints => { :year => /\d{4}/ } + :defaults => { year: nil }, + :constraints => { year: /\d{4}/ } ) ActiveSupport::Deprecation.silence do @@ -696,8 +696,8 @@ class LegacyRouteSetTests < ActiveSupport::TestCase end end - assert_equal "/test", url_for(rs, { :controller => "post", :action => "show" }) - assert_equal "/test", url_for(rs, { :controller => "post", :action => "show", :year => nil }) + assert_equal "/test", url_for(rs, { controller: "post", action: "show" }) + assert_equal "/test", url_for(rs, { controller: "post", action: "show", year: nil }) assert_equal("http://test.host/test", setup_for_named_route.send(:blog_url)) end @@ -712,42 +712,42 @@ class LegacyRouteSetTests < ActiveSupport::TestCase end assert_equal "/pages/2005", - url_for(rs, { :controller => "content", :action => "list_pages", :year => 2005 }) + url_for(rs, { controller: "content", action: "list_pages", year: 2005 }) assert_equal "/pages/2005/6", - url_for(rs, { :controller => "content", :action => "list_pages", :year => 2005, :month => 6 }) + url_for(rs, { controller: "content", action: "list_pages", year: 2005, month: 6 }) assert_equal "/pages/2005/6/12", - url_for(rs, { :controller => "content", :action => "list_pages", :year => 2005, :month => 6, :day => 12 }) + url_for(rs, { controller: "content", action: "list_pages", year: 2005, month: 6, day: 12 }) get URI("http://test.host/pages/2005/6/12") - assert_equal({ :controller => "content", :action => "list_pages", :year => "2005", :month => "6", :day => "12" }, + assert_equal({ controller: "content", action: "list_pages", year: "2005", month: "6", day: "12" }, controller.request.path_parameters) assert_equal "/pages/2005/6/4", - controller.url_for({ :day => 4, :only_path => true }) + controller.url_for({ day: 4, only_path: true }) assert_equal "/pages/2005/6", - controller.url_for({ :day => nil, :only_path => true }) + controller.url_for({ day: nil, only_path: true }) assert_equal "/pages/2005", - controller.url_for({ :day => nil, :month => nil, :only_path => true }) + controller.url_for({ day: nil, month: nil, only_path: true }) end def test_root_url_generation_with_controller_and_action rs.draw do - root :to => "content#index" + root to: "content#index" end - assert_equal "/", url_for(rs, { :controller => "content", :action => "index" }) - assert_equal "/", url_for(rs, { :controller => "content" }) + assert_equal "/", url_for(rs, { controller: "content", action: "index" }) + assert_equal "/", url_for(rs, { controller: "content" }) end def test_named_root_url_generation_with_controller_and_action rs.draw do - root :to => "content#index", :as => "home" + root to: "content#index", as: "home" end - assert_equal "/", url_for(rs, { :controller => "content", :action => "index" }) - assert_equal "/", url_for(rs, { :controller => "content" }) + assert_equal "/", url_for(rs, { controller: "content", action: "index" }) + assert_equal "/", url_for(rs, { controller: "content" }) assert_equal("http://test.host/", setup_for_named_route.send(:home_url)) end @@ -761,8 +761,8 @@ class LegacyRouteSetTests < ActiveSupport::TestCase end end - assert_equal "/categories", url_for(rs, { :controller => "content", :action => "categories" }) - assert_equal "/content/hi", url_for(rs, { :controller => "content", :action => "hi" }) + assert_equal "/categories", url_for(rs, { controller: "content", action: "categories" }) + assert_equal "/content/hi", url_for(rs, { controller: "content", action: "hi" }) end def test_named_routes_array @@ -781,10 +781,10 @@ class LegacyRouteSetTests < ActiveSupport::TestCase end assert_equal "/journal", url_for(rs, { - :controller => "content", - :action => "list_journal", - :date => nil, - :user_id => nil + controller: "content", + action: "list_journal", + date: nil, + user_id: nil }) end @@ -797,7 +797,7 @@ class LegacyRouteSetTests < ActiveSupport::TestCase %w(GET PATCH POST PUT DELETE).each do |request_method| define_method("test_request_method_recognized_with_#{request_method}") do setup_request_method_routes_for(request_method.downcase) - params = rs.recognize_path("/match", :method => request_method) + params = rs.recognize_path("/match", method: request_method) assert_equal request_method.downcase, params[:action] end end @@ -808,10 +808,10 @@ class LegacyRouteSetTests < ActiveSupport::TestCase put "/match" => "books#not_get_or_post" end - params = rs.recognize_path("/match", :method => :post) + params = rs.recognize_path("/match", method: :post) assert_equal "get_or_post", params[:action] - params = rs.recognize_path("/match", :method => :put) + params = rs.recognize_path("/match", method: :put) assert_equal "not_get_or_post", params[:action] end @@ -851,14 +851,14 @@ class LegacyRouteSetTests < ActiveSupport::TestCase end end - assert_equal "/books/7/edit", url_for(rs, { :controller => "subpath_books", :id => 7, :action => "edit" }) - assert_equal "/items/15/complete", url_for(rs, { :controller => "subpath_books", :id => 15, :action => "complete" }) - assert_equal "/posts/new/preview", url_for(rs, { :controller => "subpath_books", :action => "preview" }) + assert_equal "/books/7/edit", url_for(rs, { controller: "subpath_books", id: 7, action: "edit" }) + assert_equal "/items/15/complete", url_for(rs, { controller: "subpath_books", id: 15, action: "complete" }) + assert_equal "/posts/new/preview", url_for(rs, { controller: "subpath_books", action: "preview" }) end def test_failed_constraints_raises_exception_with_violated_constraints rs.draw do - get "foos/:id" => "foos#show", :as => "foo_with_requirement", :constraints => { :id => /\d+/ } + get "foos/:id" => "foos#show", :as => "foo_with_requirement", :constraints => { id: /\d+/ } end assert_raise(ActionController::UrlGenerationError) do @@ -933,14 +933,14 @@ class RouteSetTest < ActiveSupport::TestCase def test_generate_extras set.draw { ActiveSupport::Deprecation.silence { get ":controller/(:action(/:id))" } } - path, extras = set.generate_extras(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world") + path, extras = set.generate_extras(controller: "foo", action: "bar", id: 15, this: "hello", that: "world") assert_equal "/foo/bar/15", path assert_equal %w(that this), extras.map(&:to_s).sort end def test_extra_keys set.draw { ActiveSupport::Deprecation.silence { get ":controller/:action/:id" } } - extras = set.extra_keys(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world") + extras = set.extra_keys(controller: "foo", action: "bar", id: 15, this: "hello", that: "world") assert_equal %w(that this), extras.map(&:to_s).sort end @@ -951,7 +951,7 @@ class RouteSetTest < ActiveSupport::TestCase get ":controller/:action/:id" end end - path, extras = set.generate_extras(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world") + path, extras = set.generate_extras(controller: "foo", action: "bar", id: 15, this: "hello", that: "world") assert_equal "/foo/bar/15", path assert_equal %w(that this), extras.map(&:to_s).sort end @@ -964,7 +964,7 @@ class RouteSetTest < ActiveSupport::TestCase end end assert_equal "/foo/bar/15?this=hello", - url_for(set, { :controller => "foo", :action => "bar", :id => 15, :this => "hello" }) + url_for(set, { controller: "foo", action: "bar", id: 15, this: "hello" }) end def test_extra_keys_not_first @@ -974,7 +974,7 @@ class RouteSetTest < ActiveSupport::TestCase get ":controller/:action/:id" end end - extras = set.extra_keys(:controller => "foo", :action => "bar", :id => 15, :this => "hello", :that => "world") + extras = set.extra_keys(controller: "foo", action: "bar", id: 15, this: "hello", that: "world") assert_equal %w(that this), extras.map(&:to_s).sort end @@ -991,7 +991,7 @@ class RouteSetTest < ActiveSupport::TestCase set.draw do get "/users/index" => "users#index" end - set.recognize_path("/users/index", :method => :get) + set.recognize_path("/users/index", method: :get) assert_equal 1, set.routes.size end @@ -1028,8 +1028,8 @@ class RouteSetTest < ActiveSupport::TestCase def test_named_route_url_method controller = setup_named_route_test - assert_equal "http://test.host/people/5", controller.send(:show_url, :id => 5) - assert_equal "/people/5", controller.send(:show_path, :id => 5) + assert_equal "http://test.host/people/5", controller.send(:show_url, id: 5) + assert_equal "/people/5", controller.send(:show_path, id: 5) assert_equal "http://test.host/people", controller.send(:index_url) assert_equal "/people", controller.send(:index_path) @@ -1041,23 +1041,23 @@ class RouteSetTest < ActiveSupport::TestCase def test_named_route_url_method_with_anchor controller = setup_named_route_test - assert_equal "http://test.host/people/5#location", controller.send(:show_url, :id => 5, :anchor => "location") - assert_equal "/people/5#location", controller.send(:show_path, :id => 5, :anchor => "location") + assert_equal "http://test.host/people/5#location", controller.send(:show_url, id: 5, anchor: "location") + assert_equal "/people/5#location", controller.send(:show_path, id: 5, anchor: "location") - assert_equal "http://test.host/people#location", controller.send(:index_url, :anchor => "location") - assert_equal "/people#location", controller.send(:index_path, :anchor => "location") + assert_equal "http://test.host/people#location", controller.send(:index_url, anchor: "location") + assert_equal "/people#location", controller.send(:index_path, anchor: "location") - assert_equal "http://test.host/admin/users#location", controller.send(:users_url, :anchor => "location") - assert_equal "/admin/users#location", controller.send(:users_path, :anchor => "location") + assert_equal "http://test.host/admin/users#location", controller.send(:users_url, anchor: "location") + assert_equal "/admin/users#location", controller.send(:users_path, anchor: "location") assert_equal "http://test.host/people/go/7/hello/joe/5#location", - controller.send(:multi_url, 7, "hello", 5, :anchor => "location") + controller.send(:multi_url, 7, "hello", 5, anchor: "location") assert_equal "http://test.host/people/go/7/hello/joe/5?baz=bar#location", - controller.send(:multi_url, 7, "hello", 5, :baz => "bar", :anchor => "location") + controller.send(:multi_url, 7, "hello", 5, baz: "bar", anchor: "location") assert_equal "http://test.host/people?baz=bar#location", - controller.send(:index_url, :baz => "bar", :anchor => "location") + controller.send(:index_url, baz: "bar", anchor: "location") assert_equal "http://test.host/people", controller.send(:index_url, anchor: nil) assert_equal "http://test.host/people", controller.send(:index_url, anchor: false) @@ -1065,17 +1065,17 @@ class RouteSetTest < ActiveSupport::TestCase def test_named_route_url_method_with_port controller = setup_named_route_test - assert_equal "http://test.host:8080/people/5", controller.send(:show_url, 5, :port=>8080) + assert_equal "http://test.host:8080/people/5", controller.send(:show_url, 5, port: 8080) end def test_named_route_url_method_with_host controller = setup_named_route_test - assert_equal "http://some.example.com/people/5", controller.send(:show_url, 5, :host=>"some.example.com") + assert_equal "http://some.example.com/people/5", controller.send(:show_url, 5, host: "some.example.com") end def test_named_route_url_method_with_protocol controller = setup_named_route_test - assert_equal "https://test.host/people/5", controller.send(:show_url, 5, :protocol => "https") + assert_equal "https://test.host/people/5", controller.send(:show_url, 5, protocol: "https") end def test_named_route_url_method_with_ordered_parameters @@ -1087,7 +1087,7 @@ class RouteSetTest < ActiveSupport::TestCase def test_named_route_url_method_with_ordered_parameters_and_hash controller = setup_named_route_test assert_equal "http://test.host/people/go/7/hello/joe/5?baz=bar", - controller.send(:multi_url, 7, "hello", 5, :baz => "bar") + controller.send(:multi_url, 7, "hello", 5, baz: "bar") end def test_named_route_url_method_with_ordered_parameters_and_empty_hash @@ -1099,7 +1099,7 @@ class RouteSetTest < ActiveSupport::TestCase def test_named_route_url_method_with_no_positional_arguments controller = setup_named_route_test assert_equal "http://test.host/people?baz=bar", - controller.send(:index_url, :baz => "bar") + controller.send(:index_url, baz: "bar") end def test_draw_default_route @@ -1111,11 +1111,11 @@ class RouteSetTest < ActiveSupport::TestCase assert_equal 1, set.routes.size - assert_equal "/users/show/10", url_for(set, { :controller => "users", :action => "show", :id => 10 }) - assert_equal "/users/index/10", url_for(set, { :controller => "users", :id => 10 }) + assert_equal "/users/show/10", url_for(set, { controller: "users", action: "show", id: 10 }) + assert_equal "/users/index/10", url_for(set, { controller: "users", id: 10 }) - assert_equal({:controller => "users", :action => "index", :id => "10"}, set.recognize_path("/users/index/10")) - assert_equal({:controller => "users", :action => "index", :id => "10"}, set.recognize_path("/users/index/10/")) + assert_equal({controller: "users", action: "index", id: "10"}, set.recognize_path("/users/index/10")) + assert_equal({controller: "users", action: "index", id: "10"}, set.recognize_path("/users/index/10/")) end def test_route_with_parameter_shell @@ -1127,18 +1127,18 @@ class RouteSetTest < ActiveSupport::TestCase end end - assert_equal({:controller => "pages", :action => "index"}, request_path_params("/pages")) - assert_equal({:controller => "pages", :action => "index"}, request_path_params("/pages/index")) - assert_equal({:controller => "pages", :action => "list"}, request_path_params("/pages/list")) + assert_equal({controller: "pages", action: "index"}, request_path_params("/pages")) + assert_equal({controller: "pages", action: "index"}, request_path_params("/pages/index")) + assert_equal({controller: "pages", action: "list"}, request_path_params("/pages/list")) - assert_equal({:controller => "pages", :action => "show", :id => "10"}, request_path_params("/pages/show/10")) - assert_equal({:controller => "pages", :action => "show", :id => "10"}, request_path_params("/page/10")) + assert_equal({controller: "pages", action: "show", id: "10"}, request_path_params("/pages/show/10")) + assert_equal({controller: "pages", action: "show", id: "10"}, request_path_params("/page/10")) end def test_route_constraints_on_request_object_with_anchors_are_valid assert_nothing_raised do set.draw do - get "page/:id" => "pages#show", :constraints => { :host => /^foo$/ } + get "page/:id" => "pages#show", :constraints => { host: /^foo$/ } end end end @@ -1192,8 +1192,8 @@ class RouteSetTest < ActiveSupport::TestCase get "page/:id" => "pages#show", :id => /[a-zA-Z0-9\+]+/ end - assert_equal({:controller => "pages", :action => "show", :id => "10"}, request_path_params("/page/10")) - assert_equal({:controller => "pages", :action => "show", :id => "hello+world"}, request_path_params("/page/hello+world")) + assert_equal({controller: "pages", action: "show", id: "10"}, request_path_params("/page/10")) + assert_equal({controller: "pages", action: "show", id: "hello+world"}, request_path_params("/page/hello+world")) end def test_recognize_with_http_methods @@ -1206,54 +1206,54 @@ class RouteSetTest < ActiveSupport::TestCase delete "/people/:id" => "people#destroy" end - params = request_path_params("/people", :method => :get) + params = request_path_params("/people", method: :get) assert_equal("index", params[:action]) - params = request_path_params("/people", :method => :post) + params = request_path_params("/people", method: :post) assert_equal("create", params[:action]) - params = request_path_params("/people/5", :method => :put) + params = request_path_params("/people/5", method: :put) assert_equal("update", params[:action]) - params = request_path_params("/people/5", :method => :patch) + params = request_path_params("/people/5", method: :patch) assert_equal("update", params[:action]) assert_raise(ActionController::UnknownHttpMethod) { - request_path_params("/people", :method => :bacon) + request_path_params("/people", method: :bacon) } - params = request_path_params("/people/5", :method => :get) + params = request_path_params("/people/5", method: :get) assert_equal("show", params[:action]) assert_equal("5", params[:id]) - params = request_path_params("/people/5", :method => :put) + params = request_path_params("/people/5", method: :put) assert_equal("update", params[:action]) assert_equal("5", params[:id]) - params = request_path_params("/people/5", :method => :patch) + params = request_path_params("/people/5", method: :patch) assert_equal("update", params[:action]) assert_equal("5", params[:id]) - params = request_path_params("/people/5", :method => :delete) + params = request_path_params("/people/5", method: :delete) assert_equal("destroy", params[:action]) assert_equal("5", params[:id]) assert_raise(ActionController::RoutingError) { - request_path_params("/people/5", :method => :post) + request_path_params("/people/5", method: :post) } end def test_recognize_with_alias_in_conditions set.draw do match "/people" => "people#index", :as => "people", :via => :get - root :to => "people#index" + root to: "people#index" end - params = request_path_params("/people", :method => :get) + params = request_path_params("/people", method: :get) assert_equal("people", params[:controller]) assert_equal("index", params[:action]) - params = request_path_params("/", :method => :get) + params = request_path_params("/", method: :get) assert_equal("people", params[:controller]) assert_equal("index", params[:action]) end @@ -1264,7 +1264,7 @@ class RouteSetTest < ActiveSupport::TestCase :year => /\d{4}/, :day => /\d{1,2}/, :month => /\d{1,2}/ end - params = request_path_params("/articles/2005/11/05/a-very-interesting-article", :method => :get) + params = request_path_params("/articles/2005/11/05/a-very-interesting-article", method: :get) assert_equal("permalink", params[:action]) assert_equal("2005", params[:year]) assert_equal("11", params[:month]) @@ -1291,17 +1291,17 @@ class RouteSetTest < ActiveSupport::TestCase get "people/:id(.:format)" => "people#show" end - params = request_path_params("/people/5", :method => :get) + params = request_path_params("/people/5", method: :get) assert_equal("show", params[:action]) assert_equal("5", params[:id]) - params = request_path_params("/people/5", :method => :put) + params = request_path_params("/people/5", method: :put) assert_equal("update", params[:action]) - params = request_path_params("/people/5", :method => :patch) + params = request_path_params("/people/5", method: :patch) assert_equal("update", params[:action]) - params = request_path_params("/people/5.png", :method => :get) + params = request_path_params("/people/5.png", method: :get) assert_equal("show", params[:action]) assert_equal("5", params[:id]) assert_equal("png", params[:format]) @@ -1309,18 +1309,18 @@ class RouteSetTest < ActiveSupport::TestCase def test_generate_with_default_action set.draw do - get "/people", :controller => "people", :action => "index" - get "/people/list", :controller => "people", :action => "list" + get "/people", controller: "people", action: "index" + get "/people/list", controller: "people", action: "list" end - url = url_for(set, { :controller => "people", :action => "list" }) + url = url_for(set, { controller: "people", action: "list" }) assert_equal "/people/list", url end def test_root_map - set.draw { root :to => "people#index" } + set.draw { root to: "people#index" } - params = request_path_params("", :method => :get) + params = request_path_params("", method: :get) assert_equal("people", params[:controller]) assert_equal("index", params[:action]) end @@ -1334,7 +1334,7 @@ class RouteSetTest < ActiveSupport::TestCase end - params = request_path_params("/api/inventory", :method => :get) + params = request_path_params("/api/inventory", method: :get) assert_equal("api/products", params[:controller]) assert_equal("inventory", params[:action]) end @@ -1342,35 +1342,35 @@ class RouteSetTest < ActiveSupport::TestCase def test_namespaced_root_map set.draw do namespace "api" do - root :to => "products#index" + root to: "products#index" end end - params = request_path_params("/api", :method => :get) + params = request_path_params("/api", method: :get) assert_equal("api/products", params[:controller]) assert_equal("index", params[:action]) end def test_namespace_with_path_prefix set.draw do - scope :module => "api", :path => "prefix" do + scope module: "api", path: "prefix" do get "inventory" => "products#inventory" end end - params = request_path_params("/prefix/inventory", :method => :get) + params = request_path_params("/prefix/inventory", method: :get) assert_equal("api/products", params[:controller]) assert_equal("inventory", params[:action]) end def test_namespace_with_blank_path_prefix set.draw do - scope :module => "api", :path => "" do + scope module: "api", path: "" do get "inventory" => "products#inventory" end end - params = request_path_params("/inventory", :method => :get) + params = request_path_params("/inventory", method: :get) assert_equal("api/products", params[:controller]) assert_equal("inventory", params[:action]) end @@ -1386,7 +1386,7 @@ class RouteSetTest < ActiveSupport::TestCase get URI("http://test.host/people/7/show") - assert_equal "/people/7/destroy", controller.url_for(:action => "destroy", :only_path => true) + assert_equal "/people/7/destroy", controller.url_for(action: "destroy", only_path: true) end def test_use_static_path_when_possible @@ -1402,15 +1402,15 @@ class RouteSetTest < ActiveSupport::TestCase get URI("http://test.host/welcom/get/7") - assert_equal "/about", controller.url_for(:controller => "welcome", - :action => "about", - :only_path => true) + assert_equal "/about", controller.url_for(controller: "welcome", + action: "about", + only_path: true) end def test_generate set.draw { ActiveSupport::Deprecation.silence { get ":controller/:action/:id" } } - args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" } + args = { controller: "foo", action: "bar", id: "7", x: "y" } assert_equal "/foo/bar/7?x=y", url_for(set, args) assert_equal ["/foo/bar/7", [:x]], set.generate_extras(args) assert_equal [:x], set.extra_keys(args) @@ -1425,7 +1425,7 @@ class RouteSetTest < ActiveSupport::TestCase end end - args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" } + args = { controller: "foo", action: "bar", id: "7", x: "y" } assert_equal "/my/foo/bar/7?x=y", url_for(set, args) end @@ -1438,7 +1438,7 @@ class RouteSetTest < ActiveSupport::TestCase end end - args = { :controller => "foo", :action => "bar", :id => "7", :x => "y" } + args = { controller: "foo", action: "bar", id: "7", x: "y" } assert_equal "/foo/bar/7?x=y", url_for(set, args) end @@ -1453,14 +1453,14 @@ class RouteSetTest < ActiveSupport::TestCase end end - assert_equal({ :controller => "connection/manage", - :action => "index", }, request_path_params("/connection/manage")) + assert_equal({ controller: "connection/manage", + action: "index", }, request_path_params("/connection/manage")) - url = controller.url_for({ :controller => "connection", :only_path => true }) + url = controller.url_for({ controller: "connection", only_path: true }) assert_equal "/connection/connection", url - url = controller.url_for({ :use_route => "family_connection", - :controller => "connection", :only_path => true }) + url = controller.url_for({ use_route: "family_connection", + controller: "connection", only_path: true }) assert_equal "/connection", url end @@ -1475,9 +1475,9 @@ class RouteSetTest < ActiveSupport::TestCase get URI("http://test.host/books/show/10") - assert_equal "/books", controller.url_for(:controller => "books", - :only_path => true, - :action => "index") + assert_equal "/books", controller.url_for(controller: "books", + only_path: true, + action: "index") end def test_query_params_will_be_shown_when_recalled @@ -1494,7 +1494,7 @@ class RouteSetTest < ActiveSupport::TestCase get URI("http://test.host/weblog/show/1") assert_equal "/weblog/edit?parameter=1", controller.url_for( - {:action => "edit", :parameter => 1, :only_path => true}) + {action: "edit", parameter: 1, only_path: true}) end def test_format_is_not_inherit @@ -1503,14 +1503,14 @@ class RouteSetTest < ActiveSupport::TestCase end get URI("http://test.host/posts.xml") - assert_equal({:controller => "posts", :action => "index", :format => "xml"}, + assert_equal({controller: "posts", action: "index", format: "xml"}, controller.request.path_parameters) assert_equal "/posts", controller.url_for( - {:controller => "posts", :only_path => true}) + {controller: "posts", only_path: true}) assert_equal "/posts.xml", controller.url_for( - {:controller => "posts", :format => "xml", :only_path => true}) + {controller: "posts", format: "xml", only_path: true}) end def test_expiry_determination_should_consider_values_with_to_param @@ -1521,11 +1521,11 @@ class RouteSetTest < ActiveSupport::TestCase get URI("http://test.host/projects/1/weblog/show") assert_equal( - { :controller => "weblog", :action => "show", :project_id => "1" }, + { controller: "weblog", action: "show", project_id: "1" }, controller.request.path_parameters) assert_equal "/projects/1/weblog/show", - controller.url_for({ :action => "show", :project_id => 1, :only_path => true }) + controller.url_for({ action: "show", project_id: 1, only_path: true }) end def test_named_route_in_nested_resource @@ -1537,7 +1537,7 @@ class RouteSetTest < ActiveSupport::TestCase end end - params = set.recognize_path("/projects/1/milestones", :method => :get) + params = set.recognize_path("/projects/1/milestones", method: :get) assert_equal("milestones", params[:controller]) assert_equal("index", params[:action]) end @@ -1546,7 +1546,7 @@ class RouteSetTest < ActiveSupport::TestCase assert_nothing_raised do set.draw do namespace :admin do - root :to => "home#index" + root to: "home#index" end end end @@ -1556,7 +1556,7 @@ class RouteSetTest < ActiveSupport::TestCase assert_nothing_raised do set.draw do namespace "admin" do - root :to => "home#index" + root to: "home#index" end end end @@ -1566,7 +1566,7 @@ class RouteSetTest < ActiveSupport::TestCase assert_raise ArgumentError do set.draw do get "page/:name" => "pages#show", - :constraints => { :name => /(david|jamis)/m } + :constraints => { name: /(david|jamis)/m } end end end @@ -1575,13 +1575,13 @@ class RouteSetTest < ActiveSupport::TestCase assert_nothing_raised do set.draw do get "page/:name" => "pages#show", - :constraints => { :name => /(david|jamis)/i } + :constraints => { name: /(david|jamis)/i } end end assert_nothing_raised do set.draw do get "page/:name" => "pages#show", - :constraints => { :name => / # Desperately overcommented regexp + :constraints => { name: / # Desperately overcommented regexp ( #Either david #The Creator | #Or @@ -1599,7 +1599,7 @@ class RouteSetTest < ActiveSupport::TestCase return true } end - assert_equal({:controller => "pages", :action => "show", :name => "mypage"}, + assert_equal({controller: "pages", action: "show", name: "mypage"}, set.recognize_path("http://subdomain.example.org/page/mypage")) assert_equal(name_param, "mypage") end @@ -1607,42 +1607,42 @@ class RouteSetTest < ActiveSupport::TestCase def test_route_requirement_recognize_with_ignore_case set.draw do get "page/:name" => "pages#show", - :constraints => {:name => /(david|jamis)/i} + :constraints => {name: /(david|jamis)/i} end - assert_equal({:controller => "pages", :action => "show", :name => "jamis"}, set.recognize_path("/page/jamis")) + assert_equal({controller: "pages", action: "show", name: "jamis"}, set.recognize_path("/page/jamis")) assert_raise ActionController::RoutingError do set.recognize_path("/page/davidjamis") end - assert_equal({:controller => "pages", :action => "show", :name => "DAVID"}, set.recognize_path("/page/DAVID")) + assert_equal({controller: "pages", action: "show", name: "DAVID"}, set.recognize_path("/page/DAVID")) end def test_route_requirement_generate_with_ignore_case set.draw do get "page/:name" => "pages#show", - :constraints => {:name => /(david|jamis)/i} + :constraints => {name: /(david|jamis)/i} end - url = url_for(set, { :controller => "pages", :action => "show", :name => "david" }) + url = url_for(set, { controller: "pages", action: "show", name: "david" }) assert_equal "/page/david", url assert_raise(ActionController::UrlGenerationError) do - url_for(set, { :controller => "pages", :action => "show", :name => "davidjamis" }) + url_for(set, { controller: "pages", action: "show", name: "davidjamis" }) end - url = url_for(set, { :controller => "pages", :action => "show", :name => "JAMIS" }) + url = url_for(set, { controller: "pages", action: "show", name: "JAMIS" }) assert_equal "/page/JAMIS", url end def test_route_requirement_recognize_with_extended_syntax set.draw do get "page/:name" => "pages#show", - :constraints => {:name => / # Desperately overcommented regexp + :constraints => {name: / # Desperately overcommented regexp ( #Either david #The Creator | #Or jamis #The Deployer )/x} end - assert_equal({:controller => "pages", :action => "show", :name => "jamis"}, set.recognize_path("/page/jamis")) - assert_equal({:controller => "pages", :action => "show", :name => "david"}, set.recognize_path("/page/david")) + assert_equal({controller: "pages", action: "show", name: "jamis"}, set.recognize_path("/page/jamis")) + assert_equal({controller: "pages", action: "show", name: "david"}, set.recognize_path("/page/david")) assert_raise ActionController::RoutingError do set.recognize_path("/page/david #The Creator") end @@ -1654,7 +1654,7 @@ class RouteSetTest < ActiveSupport::TestCase def test_route_requirement_with_xi_modifiers set.draw do get "page/:name" => "pages#show", - :constraints => {:name => / # Desperately overcommented regexp + :constraints => {name: / # Desperately overcommented regexp ( #Either david #The Creator | #Or @@ -1662,20 +1662,20 @@ class RouteSetTest < ActiveSupport::TestCase )/xi} end - assert_equal({:controller => "pages", :action => "show", :name => "JAMIS"}, + assert_equal({controller: "pages", action: "show", name: "JAMIS"}, set.recognize_path("/page/JAMIS")) assert_equal "/page/JAMIS", - url_for(set, { :controller => "pages", :action => "show", :name => "JAMIS" }) + url_for(set, { controller: "pages", action: "show", name: "JAMIS" }) end def test_routes_with_symbols set.draw do - get "unnamed", :controller => :pages, :action => :show, :name => :as_symbol - get "named" , :controller => :pages, :action => :show, :name => :as_symbol, :as => :named + get "unnamed", controller: :pages, action: :show, name: :as_symbol + get "named" , controller: :pages, action: :show, name: :as_symbol, as: :named end - assert_equal({:controller => "pages", :action => "show", :name => :as_symbol}, set.recognize_path("/unnamed")) - assert_equal({:controller => "pages", :action => "show", :name => :as_symbol}, set.recognize_path("/named")) + assert_equal({controller: "pages", action: "show", name: :as_symbol}, set.recognize_path("/unnamed")) + assert_equal({controller: "pages", action: "show", name: :as_symbol}, set.recognize_path("/named")) end def test_regexp_chunk_should_add_question_mark_for_optionals @@ -1684,70 +1684,70 @@ class RouteSetTest < ActiveSupport::TestCase get "/hello" => "bar#index" end - assert_equal "/", url_for(set, { :controller => "foo" }) - assert_equal "/hello", url_for(set, { :controller => "bar" }) + assert_equal "/", url_for(set, { controller: "foo" }) + assert_equal "/hello", url_for(set, { controller: "bar" }) - assert_equal({:controller => "foo", :action => "index"}, set.recognize_path("/")) - assert_equal({:controller => "bar", :action => "index"}, set.recognize_path("/hello")) + assert_equal({controller: "foo", action: "index"}, set.recognize_path("/")) + assert_equal({controller: "bar", action: "index"}, set.recognize_path("/hello")) end def test_assign_route_options_with_anchor_chars set.draw do ActiveSupport::Deprecation.silence do - get "/cars/:action/:person/:car/", :controller => "cars" + get "/cars/:action/:person/:car/", controller: "cars" end end - assert_equal "/cars/buy/1/2", url_for(set, { :controller => "cars", :action => "buy", :person => "1", :car => "2" }) + assert_equal "/cars/buy/1/2", url_for(set, { controller: "cars", action: "buy", person: "1", car: "2" }) - assert_equal({:controller => "cars", :action => "buy", :person => "1", :car => "2"}, set.recognize_path("/cars/buy/1/2")) + assert_equal({controller: "cars", action: "buy", person: "1", car: "2"}, set.recognize_path("/cars/buy/1/2")) end def test_segmentation_of_dot_path set.draw do ActiveSupport::Deprecation.silence do - get "/books/:action.rss", :controller => "books" + get "/books/:action.rss", controller: "books" end end - assert_equal "/books/list.rss", url_for(set, { :controller => "books", :action => "list" }) + assert_equal "/books/list.rss", url_for(set, { controller: "books", action: "list" }) - assert_equal({:controller => "books", :action => "list"}, set.recognize_path("/books/list.rss")) + assert_equal({controller: "books", action: "list"}, set.recognize_path("/books/list.rss")) end def test_segmentation_of_dynamic_dot_path set.draw do ActiveSupport::Deprecation.silence do - get "/books(/:action(.:format))", :controller => "books" + get "/books(/:action(.:format))", controller: "books" end end - assert_equal "/books/list.rss", url_for(set, { :controller => "books", :action => "list", :format => "rss" }) - assert_equal "/books/list.xml", url_for(set, { :controller => "books", :action => "list", :format => "xml" }) - assert_equal "/books/list", url_for(set, { :controller => "books", :action => "list" }) - assert_equal "/books", url_for(set, { :controller => "books", :action => "index" }) + assert_equal "/books/list.rss", url_for(set, { controller: "books", action: "list", format: "rss" }) + assert_equal "/books/list.xml", url_for(set, { controller: "books", action: "list", format: "xml" }) + assert_equal "/books/list", url_for(set, { controller: "books", action: "list" }) + assert_equal "/books", url_for(set, { controller: "books", action: "index" }) - assert_equal({:controller => "books", :action => "list", :format => "rss"}, set.recognize_path("/books/list.rss")) - assert_equal({:controller => "books", :action => "list", :format => "xml"}, set.recognize_path("/books/list.xml")) - assert_equal({:controller => "books", :action => "list"}, set.recognize_path("/books/list")) - assert_equal({:controller => "books", :action => "index"}, set.recognize_path("/books")) + assert_equal({controller: "books", action: "list", format: "rss"}, set.recognize_path("/books/list.rss")) + assert_equal({controller: "books", action: "list", format: "xml"}, set.recognize_path("/books/list.xml")) + assert_equal({controller: "books", action: "list"}, set.recognize_path("/books/list")) + assert_equal({controller: "books", action: "index"}, set.recognize_path("/books")) end def test_slashes_are_implied set.draw { ActiveSupport::Deprecation.silence { get("/:controller(/:action(/:id))") } } - assert_equal "/content", url_for(set, { :controller => "content", :action => "index" }) - assert_equal "/content/list", url_for(set, { :controller => "content", :action => "list" }) - assert_equal "/content/show/1", url_for(set, { :controller => "content", :action => "show", :id => "1" }) + assert_equal "/content", url_for(set, { controller: "content", action: "index" }) + assert_equal "/content/list", url_for(set, { controller: "content", action: "list" }) + assert_equal "/content/show/1", url_for(set, { controller: "content", action: "show", id: "1" }) - assert_equal({:controller => "content", :action => "index"}, set.recognize_path("/content")) - assert_equal({:controller => "content", :action => "index"}, set.recognize_path("/content/index")) - assert_equal({:controller => "content", :action => "list"}, set.recognize_path("/content/list")) - assert_equal({:controller => "content", :action => "show", :id => "1"}, set.recognize_path("/content/show/1")) + assert_equal({controller: "content", action: "index"}, set.recognize_path("/content")) + assert_equal({controller: "content", action: "index"}, set.recognize_path("/content/index")) + assert_equal({controller: "content", action: "list"}, set.recognize_path("/content/list")) + assert_equal({controller: "content", action: "show", id: "1"}, set.recognize_path("/content/show/1")) end def test_default_route_recognition - expected = {:controller => "pages", :action => "show", :id => "10"} + expected = {controller: "pages", action: "show", id: "10"} assert_equal expected, default_route_set.recognize_path("/pages/show/10") assert_equal expected, default_route_set.recognize_path("/pages/show/10/") @@ -1767,19 +1767,19 @@ class RouteSetTest < ActiveSupport::TestCase end def test_default_route_should_omit_default_action - assert_equal "/accounts", url_for(default_route_set, { :controller => "accounts", :action => "index" }) + assert_equal "/accounts", url_for(default_route_set, { controller: "accounts", action: "index" }) end def test_default_route_should_include_default_action_when_id_present - assert_equal "/accounts/index/20", url_for(default_route_set, { :controller => "accounts", :action => "index", :id => "20" }) + assert_equal "/accounts/index/20", url_for(default_route_set, { controller: "accounts", action: "index", id: "20" }) end def test_default_route_should_work_with_action_but_no_id - assert_equal "/accounts/list_all", url_for(default_route_set, { :controller => "accounts", :action => "list_all" }) + assert_equal "/accounts/list_all", url_for(default_route_set, { controller: "accounts", action: "list_all" }) end def test_default_route_should_uri_escape_pluses - expected = { :controller => "pages", :action => "show", :id => "hello world" } + expected = { controller: "pages", action: "show", id: "hello world" } assert_equal expected, default_route_set.recognize_path("/pages/show/hello%20world") assert_equal "/pages/show/hello%20world", url_for(default_route_set, expected) @@ -1790,31 +1790,31 @@ class RouteSetTest < ActiveSupport::TestCase end def test_build_empty_query_string - assert_uri_equal "/foo", url_for(default_route_set, { :controller => "foo" }) + assert_uri_equal "/foo", url_for(default_route_set, { controller: "foo" }) end def test_build_query_string_with_nil_value - assert_uri_equal "/foo", url_for(default_route_set, { :controller => "foo", :x => nil }) + assert_uri_equal "/foo", url_for(default_route_set, { controller: "foo", x: nil }) end def test_simple_build_query_string - assert_uri_equal "/foo?x=1&y=2", url_for(default_route_set, { :controller => "foo", :x => "1", :y => "2" }) + assert_uri_equal "/foo?x=1&y=2", url_for(default_route_set, { controller: "foo", x: "1", y: "2" }) end def test_convert_ints_build_query_string - assert_uri_equal "/foo?x=1&y=2", url_for(default_route_set, { :controller => "foo", :x => 1, :y => 2 }) + assert_uri_equal "/foo?x=1&y=2", url_for(default_route_set, { controller: "foo", x: 1, y: 2 }) end def test_escape_spaces_build_query_string - assert_uri_equal "/foo?x=hello+world&y=goodbye+world", url_for(default_route_set, { :controller => "foo", :x => "hello world", :y => "goodbye world" }) + assert_uri_equal "/foo?x=hello+world&y=goodbye+world", url_for(default_route_set, { controller: "foo", x: "hello world", y: "goodbye world" }) end def test_expand_array_build_query_string - assert_uri_equal "/foo?x%5B%5D=1&x%5B%5D=2", url_for(default_route_set, { :controller => "foo", :x => [1, 2] }) + assert_uri_equal "/foo?x%5B%5D=1&x%5B%5D=2", url_for(default_route_set, { controller: "foo", x: [1, 2] }) end def test_escape_spaces_build_query_string_selected_keys - assert_uri_equal "/foo?x=hello+world", url_for(default_route_set, { :controller => "foo", :x => "hello world" }) + assert_uri_equal "/foo?x=hello+world", url_for(default_route_set, { controller: "foo", x: "hello world" }) end def test_generate_with_default_params @@ -1822,15 +1822,15 @@ class RouteSetTest < ActiveSupport::TestCase get "dummy/page/:page" => "dummy#show" get "dummy/dots/page.:page" => "dummy#dots" get "ibocorp(/:page)" => "ibocorp#show", - :constraints => { :page => /\d+/ }, - :defaults => { :page => 1 } + :constraints => { page: /\d+/ }, + :defaults => { page: 1 } ActiveSupport::Deprecation.silence do get ":controller/:action/:id" end end - assert_equal "/ibocorp", url_for(set, { :controller => "ibocorp", :action => "show", :page => 1 }) + assert_equal "/ibocorp", url_for(set, { controller: "ibocorp", action: "show", page: 1 }) end include ActionDispatch::RoutingVerbs @@ -1841,21 +1841,21 @@ class RouteSetTest < ActiveSupport::TestCase @set = make_set false set.draw do - get "blog/", :controller => "blog", :action => "index" + get "blog/", controller: "blog", action: "index" get "blog(/:year(/:month(/:day)))", - :controller => "blog", - :action => "show_date", - :constraints => { :year => /(19|20)\d\d/, :month => /[01]?\d/, :day => /[0-3]?\d/ }, - :day => nil, :month => nil + controller: "blog", + action: "show_date", + constraints: { year: /(19|20)\d\d/, month: /[01]?\d/, day: /[0-3]?\d/ }, + day: nil, month: nil - get "blog/show/:id", :controller => "blog", :action => "show", :id => /\d+/ + get "blog/show/:id", controller: "blog", action: "show", id: /\d+/ ActiveSupport::Deprecation.silence do get "blog/:controller/:action(/:id)" end - get "*anything", :controller => "blog", :action => "unknown_request" + get "*anything", controller: "blog", action: "unknown_request" end recognize_path = ->(path) { @@ -1863,24 +1863,24 @@ class RouteSetTest < ActiveSupport::TestCase controller.request.path_parameters } - assert_equal({:controller => "blog", :action => "index"}, recognize_path.("/blog")) - assert_equal({:controller => "blog", :action => "show", :id => "123"}, recognize_path.("/blog/show/123")) - assert_equal({:controller => "blog", :action => "show_date", :year => "2004", :day => nil, :month => nil }, recognize_path.("/blog/2004")) - assert_equal({:controller => "blog", :action => "show_date", :year => "2004", :month => "12", :day => nil }, recognize_path.("/blog/2004/12")) - assert_equal({:controller => "blog", :action => "show_date", :year => "2004", :month => "12", :day => "25"}, recognize_path.("/blog/2004/12/25")) - assert_equal({:controller => "articles", :action => "edit", :id => "123"}, recognize_path.("/blog/articles/edit/123")) - assert_equal({:controller => "articles", :action => "show_stats"}, recognize_path.("/blog/articles/show_stats")) - assert_equal({:controller => "blog", :action => "unknown_request", :anything => "blog/wibble"}, recognize_path.("/blog/wibble")) - assert_equal({:controller => "blog", :action => "unknown_request", :anything => "junk"}, recognize_path.("/junk")) + assert_equal({controller: "blog", action: "index"}, recognize_path.("/blog")) + assert_equal({controller: "blog", action: "show", id: "123"}, recognize_path.("/blog/show/123")) + assert_equal({controller: "blog", action: "show_date", year: "2004", day: nil, month: nil }, recognize_path.("/blog/2004")) + assert_equal({controller: "blog", action: "show_date", year: "2004", month: "12", day: nil }, recognize_path.("/blog/2004/12")) + assert_equal({controller: "blog", action: "show_date", year: "2004", month: "12", day: "25"}, recognize_path.("/blog/2004/12/25")) + assert_equal({controller: "articles", action: "edit", id: "123"}, recognize_path.("/blog/articles/edit/123")) + assert_equal({controller: "articles", action: "show_stats"}, recognize_path.("/blog/articles/show_stats")) + assert_equal({controller: "blog", action: "unknown_request", anything: "blog/wibble"}, recognize_path.("/blog/wibble")) + assert_equal({controller: "blog", action: "unknown_request", anything: "junk"}, recognize_path.("/junk")) get URI("http://example.org/blog/2006/07/28") - assert_equal({:controller => "blog", :action => "show_date", :year => "2006", :month => "07", :day => "28"}, controller.request.path_parameters) - assert_equal("/blog/2006/07/25", controller.url_for({ :day => 25, :only_path => true })) - assert_equal("/blog/2005", controller.url_for({ :year => 2005, :only_path => true })) - assert_equal("/blog/show/123", controller.url_for({ :action => "show" , :id => 123, :only_path => true })) - assert_equal("/blog/2006", controller.url_for({ :year => 2006, :only_path => true })) - assert_equal("/blog/2006", controller.url_for({ :year => 2006, :month => nil, :only_path => true })) + assert_equal({controller: "blog", action: "show_date", year: "2006", month: "07", day: "28"}, controller.request.path_parameters) + assert_equal("/blog/2006/07/25", controller.url_for({ day: 25, only_path: true })) + assert_equal("/blog/2005", controller.url_for({ year: 2005, only_path: true })) + assert_equal("/blog/show/123", controller.url_for({ action: "show" , id: 123, only_path: true })) + assert_equal("/blog/2006", controller.url_for({ year: 2006, only_path: true })) + assert_equal("/blog/2006", controller.url_for({ year: 2006, month: nil, only_path: true })) end private @@ -1906,27 +1906,27 @@ class RackMountIntegrationTests < ActiveSupport::TestCase end namespace "api" do - root :to => "users#index" + root to: "users#index" end get "/blog(/:year(/:month(/:day)))" => "posts#show_date", :constraints => { - :year => /(19|20)\d\d/, - :month => /[01]?\d/, - :day => /[0-3]?\d/ + year: /(19|20)\d\d/, + month: /[01]?\d/, + day: /[0-3]?\d/ }, :day => nil, :month => nil - get "archive/:year", :controller => "archive", :action => "index", - :defaults => { :year => nil }, - :constraints => { :year => /\d{4}/ }, - :as => "blog" + get "archive/:year", controller: "archive", action: "index", + defaults: { year: nil }, + constraints: { year: /\d{4}/ }, + as: "blog" resources :people get "legacy/people" => "people#index", :legacy => "true" - get "symbols", :controller => :symbols, :action => :show, :name => :as_symbol + get "symbols", controller: :symbols, action: :show, name: :as_symbol get "id_default(/:id)" => "foo#id_default", :id => 1 match "get_or_post" => "foo#get_or_post", :via => [:get, :post] get "optional/:optional" => "posts#index" @@ -1935,7 +1935,7 @@ class RackMountIntegrationTests < ActiveSupport::TestCase get "ignorecase/geocode/:postalcode" => "geocode#show", :postalcode => /hx\d\d-\d[a-z]{2}/i get "extended/geocode/:postalcode" => "geocode#show",:constraints => { - :postalcode => /# Postcode format + postalcode: /# Postcode format \d{5} #Prefix (-\d{4})? #Suffix /x @@ -1945,19 +1945,19 @@ class RackMountIntegrationTests < ActiveSupport::TestCase ActiveSupport::Deprecation.silence do get "comment/:id(/:action)" => "comments#show" - get "ws/:controller(/:action(/:id))", :ws => true + get "ws/:controller(/:action(/:id))", ws: true get "account(/:action)" => "account#subscription" get "pages/:page_id/:controller(/:action(/:id))" - get ":controller/ping", :action => "ping" + get ":controller/ping", action: "ping" end - get "こんにちは/世界", :controller => "news", :action => "index" + get "こんにちは/世界", controller: "news", action: "index" ActiveSupport::Deprecation.silence do - match ":controller(/:action(/:id))(.:format)", :via => :all + match ":controller(/:action(/:id))(.:format)", via: :all end - root :to => "news#index" + root to: "news#index" } attr_reader :routes @@ -1969,118 +1969,118 @@ class RackMountIntegrationTests < ActiveSupport::TestCase end def test_recognize_path - assert_equal({:controller => "admin/users", :action => "index"}, @routes.recognize_path("/admin/users", :method => :get)) - assert_equal({:controller => "admin/users", :action => "create"}, @routes.recognize_path("/admin/users", :method => :post)) - assert_equal({:controller => "admin/users", :action => "new"}, @routes.recognize_path("/admin/users/new", :method => :get)) - assert_equal({:controller => "admin/users", :action => "show", :id => "1"}, @routes.recognize_path("/admin/users/1", :method => :get)) - assert_equal({:controller => "admin/users", :action => "update", :id => "1"}, @routes.recognize_path("/admin/users/1", :method => :put)) - assert_equal({:controller => "admin/users", :action => "destroy", :id => "1"}, @routes.recognize_path("/admin/users/1", :method => :delete)) - assert_equal({:controller => "admin/users", :action => "edit", :id => "1"}, @routes.recognize_path("/admin/users/1/edit", :method => :get)) - - assert_equal({:controller => "admin/posts", :action => "index"}, @routes.recognize_path("/admin/posts", :method => :get)) - assert_equal({:controller => "admin/posts", :action => "new"}, @routes.recognize_path("/admin/posts/new", :method => :get)) - - assert_equal({:controller => "api/users", :action => "index"}, @routes.recognize_path("/api", :method => :get)) - assert_equal({:controller => "api/users", :action => "index"}, @routes.recognize_path("/api/", :method => :get)) - - assert_equal({:controller => "posts", :action => "show_date", :year => "2009", :month => nil, :day => nil }, @routes.recognize_path("/blog/2009", :method => :get)) - assert_equal({:controller => "posts", :action => "show_date", :year => "2009", :month => "01", :day => nil }, @routes.recognize_path("/blog/2009/01", :method => :get)) - assert_equal({:controller => "posts", :action => "show_date", :year => "2009", :month => "01", :day => "01"}, @routes.recognize_path("/blog/2009/01/01", :method => :get)) - - assert_equal({:controller => "archive", :action => "index", :year => "2010"}, @routes.recognize_path("/archive/2010")) - assert_equal({:controller => "archive", :action => "index"}, @routes.recognize_path("/archive")) - - assert_equal({:controller => "people", :action => "index"}, @routes.recognize_path("/people", :method => :get)) - assert_equal({:controller => "people", :action => "index", :format => "xml"}, @routes.recognize_path("/people.xml", :method => :get)) - assert_equal({:controller => "people", :action => "create"}, @routes.recognize_path("/people", :method => :post)) - assert_equal({:controller => "people", :action => "new"}, @routes.recognize_path("/people/new", :method => :get)) - assert_equal({:controller => "people", :action => "show", :id => "1"}, @routes.recognize_path("/people/1", :method => :get)) - assert_equal({:controller => "people", :action => "show", :id => "1", :format => "xml"}, @routes.recognize_path("/people/1.xml", :method => :get)) - assert_equal({:controller => "people", :action => "update", :id => "1"}, @routes.recognize_path("/people/1", :method => :put)) - assert_equal({:controller => "people", :action => "destroy", :id => "1"}, @routes.recognize_path("/people/1", :method => :delete)) - assert_equal({:controller => "people", :action => "edit", :id => "1"}, @routes.recognize_path("/people/1/edit", :method => :get)) - assert_equal({:controller => "people", :action => "edit", :id => "1", :format => "xml"}, @routes.recognize_path("/people/1/edit.xml", :method => :get)) - - assert_equal({:controller => "symbols", :action => "show", :name => :as_symbol}, @routes.recognize_path("/symbols")) - assert_equal({:controller => "foo", :action => "id_default", :id => "1"}, @routes.recognize_path("/id_default/1")) - assert_equal({:controller => "foo", :action => "id_default", :id => "2"}, @routes.recognize_path("/id_default/2")) - assert_equal({:controller => "foo", :action => "id_default", :id => 1 }, @routes.recognize_path("/id_default")) - assert_equal({:controller => "foo", :action => "get_or_post"}, @routes.recognize_path("/get_or_post", :method => :get)) - assert_equal({:controller => "foo", :action => "get_or_post"}, @routes.recognize_path("/get_or_post", :method => :post)) - assert_raise(ActionController::RoutingError) { @routes.recognize_path("/get_or_post", :method => :put) } - assert_raise(ActionController::RoutingError) { @routes.recognize_path("/get_or_post", :method => :delete) } - - assert_equal({:controller => "posts", :action => "index", :optional => "bar"}, @routes.recognize_path("/optional/bar")) + assert_equal({controller: "admin/users", action: "index"}, @routes.recognize_path("/admin/users", method: :get)) + assert_equal({controller: "admin/users", action: "create"}, @routes.recognize_path("/admin/users", method: :post)) + assert_equal({controller: "admin/users", action: "new"}, @routes.recognize_path("/admin/users/new", method: :get)) + assert_equal({controller: "admin/users", action: "show", id: "1"}, @routes.recognize_path("/admin/users/1", method: :get)) + assert_equal({controller: "admin/users", action: "update", id: "1"}, @routes.recognize_path("/admin/users/1", method: :put)) + assert_equal({controller: "admin/users", action: "destroy", id: "1"}, @routes.recognize_path("/admin/users/1", method: :delete)) + assert_equal({controller: "admin/users", action: "edit", id: "1"}, @routes.recognize_path("/admin/users/1/edit", method: :get)) + + assert_equal({controller: "admin/posts", action: "index"}, @routes.recognize_path("/admin/posts", method: :get)) + assert_equal({controller: "admin/posts", action: "new"}, @routes.recognize_path("/admin/posts/new", method: :get)) + + assert_equal({controller: "api/users", action: "index"}, @routes.recognize_path("/api", method: :get)) + assert_equal({controller: "api/users", action: "index"}, @routes.recognize_path("/api/", method: :get)) + + assert_equal({controller: "posts", action: "show_date", year: "2009", month: nil, day: nil }, @routes.recognize_path("/blog/2009", method: :get)) + assert_equal({controller: "posts", action: "show_date", year: "2009", month: "01", day: nil }, @routes.recognize_path("/blog/2009/01", method: :get)) + assert_equal({controller: "posts", action: "show_date", year: "2009", month: "01", day: "01"}, @routes.recognize_path("/blog/2009/01/01", method: :get)) + + assert_equal({controller: "archive", action: "index", year: "2010"}, @routes.recognize_path("/archive/2010")) + assert_equal({controller: "archive", action: "index"}, @routes.recognize_path("/archive")) + + assert_equal({controller: "people", action: "index"}, @routes.recognize_path("/people", method: :get)) + assert_equal({controller: "people", action: "index", format: "xml"}, @routes.recognize_path("/people.xml", method: :get)) + assert_equal({controller: "people", action: "create"}, @routes.recognize_path("/people", method: :post)) + assert_equal({controller: "people", action: "new"}, @routes.recognize_path("/people/new", method: :get)) + assert_equal({controller: "people", action: "show", id: "1"}, @routes.recognize_path("/people/1", method: :get)) + assert_equal({controller: "people", action: "show", id: "1", format: "xml"}, @routes.recognize_path("/people/1.xml", method: :get)) + assert_equal({controller: "people", action: "update", id: "1"}, @routes.recognize_path("/people/1", method: :put)) + assert_equal({controller: "people", action: "destroy", id: "1"}, @routes.recognize_path("/people/1", method: :delete)) + assert_equal({controller: "people", action: "edit", id: "1"}, @routes.recognize_path("/people/1/edit", method: :get)) + assert_equal({controller: "people", action: "edit", id: "1", format: "xml"}, @routes.recognize_path("/people/1/edit.xml", method: :get)) + + assert_equal({controller: "symbols", action: "show", name: :as_symbol}, @routes.recognize_path("/symbols")) + assert_equal({controller: "foo", action: "id_default", id: "1"}, @routes.recognize_path("/id_default/1")) + assert_equal({controller: "foo", action: "id_default", id: "2"}, @routes.recognize_path("/id_default/2")) + assert_equal({controller: "foo", action: "id_default", id: 1 }, @routes.recognize_path("/id_default")) + assert_equal({controller: "foo", action: "get_or_post"}, @routes.recognize_path("/get_or_post", method: :get)) + assert_equal({controller: "foo", action: "get_or_post"}, @routes.recognize_path("/get_or_post", method: :post)) + assert_raise(ActionController::RoutingError) { @routes.recognize_path("/get_or_post", method: :put) } + assert_raise(ActionController::RoutingError) { @routes.recognize_path("/get_or_post", method: :delete) } + + assert_equal({controller: "posts", action: "index", optional: "bar"}, @routes.recognize_path("/optional/bar")) assert_raise(ActionController::RoutingError) { @routes.recognize_path("/optional") } - assert_equal({:controller => "posts", :action => "show", :id => "1", :ws => true}, @routes.recognize_path("/ws/posts/show/1", :method => :get)) - assert_equal({:controller => "posts", :action => "list", :ws => true}, @routes.recognize_path("/ws/posts/list", :method => :get)) - assert_equal({:controller => "posts", :action => "index", :ws => true}, @routes.recognize_path("/ws/posts", :method => :get)) + assert_equal({controller: "posts", action: "show", id: "1", ws: true}, @routes.recognize_path("/ws/posts/show/1", method: :get)) + assert_equal({controller: "posts", action: "list", ws: true}, @routes.recognize_path("/ws/posts/list", method: :get)) + assert_equal({controller: "posts", action: "index", ws: true}, @routes.recognize_path("/ws/posts", method: :get)) - assert_equal({:controller => "account", :action => "subscription"}, @routes.recognize_path("/account", :method => :get)) - assert_equal({:controller => "account", :action => "subscription"}, @routes.recognize_path("/account/subscription", :method => :get)) - assert_equal({:controller => "account", :action => "billing"}, @routes.recognize_path("/account/billing", :method => :get)) + assert_equal({controller: "account", action: "subscription"}, @routes.recognize_path("/account", method: :get)) + assert_equal({controller: "account", action: "subscription"}, @routes.recognize_path("/account/subscription", method: :get)) + assert_equal({controller: "account", action: "billing"}, @routes.recognize_path("/account/billing", method: :get)) - assert_equal({:page_id => "1", :controller => "notes", :action => "index"}, @routes.recognize_path("/pages/1/notes", :method => :get)) - assert_equal({:page_id => "1", :controller => "notes", :action => "list"}, @routes.recognize_path("/pages/1/notes/list", :method => :get)) - assert_equal({:page_id => "1", :controller => "notes", :action => "show", :id => "2"}, @routes.recognize_path("/pages/1/notes/show/2", :method => :get)) + assert_equal({page_id: "1", controller: "notes", action: "index"}, @routes.recognize_path("/pages/1/notes", method: :get)) + assert_equal({page_id: "1", controller: "notes", action: "list"}, @routes.recognize_path("/pages/1/notes/list", method: :get)) + assert_equal({page_id: "1", controller: "notes", action: "show", id: "2"}, @routes.recognize_path("/pages/1/notes/show/2", method: :get)) - assert_equal({:controller => "posts", :action => "ping"}, @routes.recognize_path("/posts/ping", :method => :get)) - assert_equal({:controller => "posts", :action => "index"}, @routes.recognize_path("/posts", :method => :get)) - assert_equal({:controller => "posts", :action => "index"}, @routes.recognize_path("/posts/index", :method => :get)) - assert_equal({:controller => "posts", :action => "show"}, @routes.recognize_path("/posts/show", :method => :get)) - assert_equal({:controller => "posts", :action => "show", :id => "1"}, @routes.recognize_path("/posts/show/1", :method => :get)) - assert_equal({:controller => "posts", :action => "create"}, @routes.recognize_path("/posts/create", :method => :post)) + assert_equal({controller: "posts", action: "ping"}, @routes.recognize_path("/posts/ping", method: :get)) + assert_equal({controller: "posts", action: "index"}, @routes.recognize_path("/posts", method: :get)) + assert_equal({controller: "posts", action: "index"}, @routes.recognize_path("/posts/index", method: :get)) + assert_equal({controller: "posts", action: "show"}, @routes.recognize_path("/posts/show", method: :get)) + assert_equal({controller: "posts", action: "show", id: "1"}, @routes.recognize_path("/posts/show/1", method: :get)) + assert_equal({controller: "posts", action: "create"}, @routes.recognize_path("/posts/create", method: :post)) - assert_equal({:controller => "geocode", :action => "show", :postalcode => "hx12-1az"}, @routes.recognize_path("/ignorecase/geocode/hx12-1az")) - assert_equal({:controller => "geocode", :action => "show", :postalcode => "hx12-1AZ"}, @routes.recognize_path("/ignorecase/geocode/hx12-1AZ")) - assert_equal({:controller => "geocode", :action => "show", :postalcode => "12345-1234"}, @routes.recognize_path("/extended/geocode/12345-1234")) - assert_equal({:controller => "geocode", :action => "show", :postalcode => "12345"}, @routes.recognize_path("/extended/geocode/12345")) + assert_equal({controller: "geocode", action: "show", postalcode: "hx12-1az"}, @routes.recognize_path("/ignorecase/geocode/hx12-1az")) + assert_equal({controller: "geocode", action: "show", postalcode: "hx12-1AZ"}, @routes.recognize_path("/ignorecase/geocode/hx12-1AZ")) + assert_equal({controller: "geocode", action: "show", postalcode: "12345-1234"}, @routes.recognize_path("/extended/geocode/12345-1234")) + assert_equal({controller: "geocode", action: "show", postalcode: "12345"}, @routes.recognize_path("/extended/geocode/12345")) - assert_equal({:controller => "news", :action => "index" }, @routes.recognize_path("/", :method => :get)) - assert_equal({:controller => "news", :action => "index", :format => "rss"}, @routes.recognize_path("/news.rss", :method => :get)) + assert_equal({controller: "news", action: "index" }, @routes.recognize_path("/", method: :get)) + assert_equal({controller: "news", action: "index", format: "rss"}, @routes.recognize_path("/news.rss", method: :get)) - assert_raise(ActionController::RoutingError) { @routes.recognize_path("/none", :method => :get) } + assert_raise(ActionController::RoutingError) { @routes.recognize_path("/none", method: :get) } end def test_generate_extras - assert_equal ["/people", []], @routes.generate_extras(:controller => "people") - assert_equal ["/people", [:foo]], @routes.generate_extras(:controller => "people", :foo => "bar") - assert_equal ["/people", []], @routes.generate_extras(:controller => "people", :action => "index") - assert_equal ["/people", [:foo]], @routes.generate_extras(:controller => "people", :action => "index", :foo => "bar") - assert_equal ["/people/new", []], @routes.generate_extras(:controller => "people", :action => "new") - assert_equal ["/people/new", [:foo]], @routes.generate_extras(:controller => "people", :action => "new", :foo => "bar") - assert_equal ["/people/1", []], @routes.generate_extras(:controller => "people", :action => "show", :id => "1") - assert_equal ["/people/1", [:bar, :foo]], sort_extras!(@routes.generate_extras(:controller => "people", :action => "show", :id => "1", :foo => "2", :bar => "3")) - assert_equal ["/people", [:person]], @routes.generate_extras(:controller => "people", :action => "create", :person => { :first_name => "Josh", :last_name => "Peek" }) - assert_equal ["/people", [:people]], @routes.generate_extras(:controller => "people", :action => "create", :people => ["Josh", "Dave"]) - - assert_equal ["/posts/show/1", []], @routes.generate_extras(:controller => "posts", :action => "show", :id => "1") - assert_equal ["/posts/show/1", [:bar, :foo]], sort_extras!(@routes.generate_extras(:controller => "posts", :action => "show", :id => "1", :foo => "2", :bar => "3")) - assert_equal ["/posts", []], @routes.generate_extras(:controller => "posts", :action => "index") - assert_equal ["/posts", [:foo]], @routes.generate_extras(:controller => "posts", :action => "index", :foo => "bar") + assert_equal ["/people", []], @routes.generate_extras(controller: "people") + assert_equal ["/people", [:foo]], @routes.generate_extras(controller: "people", foo: "bar") + assert_equal ["/people", []], @routes.generate_extras(controller: "people", action: "index") + assert_equal ["/people", [:foo]], @routes.generate_extras(controller: "people", action: "index", foo: "bar") + assert_equal ["/people/new", []], @routes.generate_extras(controller: "people", action: "new") + assert_equal ["/people/new", [:foo]], @routes.generate_extras(controller: "people", action: "new", foo: "bar") + assert_equal ["/people/1", []], @routes.generate_extras(controller: "people", action: "show", id: "1") + assert_equal ["/people/1", [:bar, :foo]], sort_extras!(@routes.generate_extras(controller: "people", action: "show", id: "1", foo: "2", bar: "3")) + assert_equal ["/people", [:person]], @routes.generate_extras(controller: "people", action: "create", person: { first_name: "Josh", last_name: "Peek" }) + assert_equal ["/people", [:people]], @routes.generate_extras(controller: "people", action: "create", people: ["Josh", "Dave"]) + + assert_equal ["/posts/show/1", []], @routes.generate_extras(controller: "posts", action: "show", id: "1") + assert_equal ["/posts/show/1", [:bar, :foo]], sort_extras!(@routes.generate_extras(controller: "posts", action: "show", id: "1", foo: "2", bar: "3")) + assert_equal ["/posts", []], @routes.generate_extras(controller: "posts", action: "index") + assert_equal ["/posts", [:foo]], @routes.generate_extras(controller: "posts", action: "index", foo: "bar") end def test_extras - params = {:controller => "people"} + params = {controller: "people"} assert_equal [], @routes.extra_keys(params) - assert_equal({:controller => "people", :action => "index"}, params) + assert_equal({controller: "people", action: "index"}, params) - params = {:controller => "people", :foo => "bar"} + params = {controller: "people", foo: "bar"} assert_equal [:foo], @routes.extra_keys(params) - assert_equal({:controller => "people", :action => "index", :foo => "bar"}, params) + assert_equal({controller: "people", action: "index", foo: "bar"}, params) - params = {:controller => "people", :action => "create", :person => { :name => "Josh"}} + params = {controller: "people", action: "create", person: { name: "Josh"}} assert_equal [:person], @routes.extra_keys(params) - assert_equal({:controller => "people", :action => "create", :person => { :name => "Josh"}}, params) + assert_equal({controller: "people", action: "create", person: { name: "Josh"}}, params) end def test_unicode_path - assert_equal({:controller => "news", :action => "index"}, @routes.recognize_path(URI.parser.escape("こんにちは/世界"), :method => :get)) + assert_equal({controller: "news", action: "index"}, @routes.recognize_path(URI.parser.escape("こんにちは/世界"), method: :get)) end def test_downcased_unicode_path - assert_equal({:controller => "news", :action => "index"}, @routes.recognize_path(URI.parser.escape("こんにちは/世界").downcase, :method => :get)) + assert_equal({controller: "news", action: "index"}, @routes.recognize_path(URI.parser.escape("こんにちは/世界").downcase, method: :get)) end private |