X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/30a01fb7f9dedc757a27f9bf97e3d720f4530508..e1234bc9601bee5536689f7d95695102a5fcacaf:/test/controllers/site_controller_test.rb?ds=sidebyside diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb index cc155155f..5bd8df18d 100644 --- a/test/controllers/site_controller_test.rb +++ b/test/controllers/site_controller_test.rb @@ -89,13 +89,13 @@ class SiteControllerTest < ActionDispatch::IntegrationTest # Test the index page redirects def test_index_redirect get root_path(:node => 123) - assert_redirected_to :controller => :browse, :action => :node, :id => 123 + assert_redirected_to node_path(123) get root_path(:way => 123) - assert_redirected_to :controller => :browse, :action => :way, :id => 123 + assert_redirected_to way_path(123) get root_path(:relation => 123) - assert_redirected_to :controller => :browse, :action => :relation, :id => 123 + assert_redirected_to relation_path(123) get root_path(:note => 123) assert_redirected_to :controller => :notes, :action => :show, :id => 123 @@ -122,32 +122,25 @@ class SiteControllerTest < ActionDispatch::IntegrationTest # Test the permalink redirect def test_permalink get permalink_path(:code => "wBz3--") - assert_response :redirect assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4.8779296875/3.955078125" get permalink_path(:code => "wBz3--", :m => "") - assert_response :redirect assert_redirected_to :controller => :site, :action => :index, :mlat => "4.8779296875", :mlon => "3.955078125", :anchor => "map=3/4.8779296875/3.955078125" get permalink_path(:code => "wBz3--", :layers => "T") - assert_response :redirect assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4.8779296875/3.955078125&layers=T" get permalink_path(:code => "wBz3--", :node => 1) - assert_response :redirect - assert_redirected_to :controller => :browse, :action => :node, :id => 1, :anchor => "map=3/4.8779296875/3.955078125" + assert_redirected_to node_path(1, :anchor => "map=3/4.8779296875/3.955078125") get permalink_path(:code => "wBz3--", :way => 2) - assert_response :redirect - assert_redirected_to :controller => :browse, :action => :way, :id => 2, :anchor => "map=3/4.8779296875/3.955078125" + assert_redirected_to way_path(2, :anchor => "map=3/4.8779296875/3.955078125") get permalink_path(:code => "wBz3--", :relation => 3) - assert_response :redirect - assert_redirected_to :controller => :browse, :action => :relation, :id => 3, :anchor => "map=3/4.8779296875/3.955078125" + assert_redirected_to relation_path(3, :anchor => "map=3/4.8779296875/3.955078125") get permalink_path(:code => "wBz3--", :changeset => 4) - assert_response :redirect - assert_redirected_to :controller => :browse, :action => :changeset, :id => 4, :anchor => "map=3/4.8779296875/3.955078125" + assert_redirected_to changeset_path(4, :anchor => "map=3/4.8779296875/3.955078125") end # Test the key page @@ -163,7 +156,6 @@ class SiteControllerTest < ActionDispatch::IntegrationTest def test_edit get edit_path - assert_response :redirect assert_redirected_to login_path(:referer => "/edit") end @@ -437,7 +429,6 @@ class SiteControllerTest < ActionDispatch::IntegrationTest # Test the welcome page def test_welcome get welcome_path - assert_response :redirect assert_redirected_to login_path(:referer => "/welcome") session_for(create(:user)) @@ -530,7 +521,6 @@ class SiteControllerTest < ActionDispatch::IntegrationTest def test_id_without_login get id_path - assert_response :redirect assert_redirected_to login_path(:referer => "/id") end end