X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/63303c22b704ca290c16ae908da1324f3ea25b2c..7fb984f9152d18844502df46d934da9c6deda05c:/test/controllers/traces_controller_test.rb diff --git a/test/controllers/traces_controller_test.rb b/test/controllers/traces_controller_test.rb index cd9f5f127..614b21b1e 100644 --- a/test/controllers/traces_controller_test.rb +++ b/test/controllers/traces_controller_test.rb @@ -8,51 +8,27 @@ class TracesControllerTest < ActionDispatch::IntegrationTest { :path => "/traces", :method => :get }, { :controller => "traces", :action => "index" } ) - assert_routing( - { :path => "/traces/page/1", :method => :get }, - { :controller => "traces", :action => "index", :page => "1" } - ) assert_routing( { :path => "/traces/tag/tagname", :method => :get }, { :controller => "traces", :action => "index", :tag => "tagname" } ) - assert_routing( - { :path => "/traces/tag/tagname/page/1", :method => :get }, - { :controller => "traces", :action => "index", :tag => "tagname", :page => "1" } - ) assert_routing( { :path => "/user/username/traces", :method => :get }, { :controller => "traces", :action => "index", :display_name => "username" } ) - assert_routing( - { :path => "/user/username/traces/page/1", :method => :get }, - { :controller => "traces", :action => "index", :display_name => "username", :page => "1" } - ) assert_routing( { :path => "/user/username/traces/tag/tagname", :method => :get }, { :controller => "traces", :action => "index", :display_name => "username", :tag => "tagname" } ) - assert_routing( - { :path => "/user/username/traces/tag/tagname/page/1", :method => :get }, - { :controller => "traces", :action => "index", :display_name => "username", :tag => "tagname", :page => "1" } - ) assert_routing( { :path => "/traces/mine", :method => :get }, { :controller => "traces", :action => "mine" } ) - assert_routing( - { :path => "/traces/mine/page/1", :method => :get }, - { :controller => "traces", :action => "mine", :page => "1" } - ) assert_routing( { :path => "/traces/mine/tag/tagname", :method => :get }, { :controller => "traces", :action => "mine", :tag => "tagname" } ) - assert_routing( - { :path => "/traces/mine/tag/tagname/page/1", :method => :get }, - { :controller => "traces", :action => "mine", :tag => "tagname", :page => "1" } - ) assert_routing( { :path => "/traces/rss", :method => :get }, @@ -112,6 +88,24 @@ class TracesControllerTest < ActionDispatch::IntegrationTest { :path => "/traces/1", :method => :delete }, { :controller => "traces", :action => "destroy", :id => "1" } ) + + get "/traces/page/1" + assert_redirected_to "/traces" + + get "/traces/tag/tagname/page/1" + assert_redirected_to "/traces/tag/tagname" + + get "/user/username/traces/page/1" + assert_redirected_to "/user/username/traces" + + get "/user/username/traces/tag/tagname/page/1" + assert_redirected_to "/user/username/traces/tag/tagname" + + get "/traces/mine/page/1" + assert_redirected_to "/traces/mine" + + get "/traces/mine/tag/tagname/page/1" + assert_redirected_to "/traces/mine/tag/tagname" end # Check that the index of traces is displayed