X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..119016255ec56bb7e7bc74be19858380e868da93:/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 01c1f3a22..453af4550 100644 --- a/test/controllers/site_controller_test.rb +++ b/test/controllers/site_controller_test.rb @@ -91,6 +91,21 @@ class SiteControllerTest < ActionController::TestCase # Test the index page redirects def test_index_redirect + get :index, :node => 123 + assert_redirected_to :controller => :browse, :action => :node, :id => 123 + + get :index, :way => 123 + assert_redirected_to :controller => :browse, :action => :way, :id => 123 + + get :index, :relation => 123 + assert_redirected_to :controller => :browse, :action => :relation, :id => 123 + + get :index, :note => 123 + assert_redirected_to :controller => :browse, :action => :note, :id => 123 + + get :index, :query => "test" + assert_redirected_to :controller => :geocoder, :action => :search, :query => "test" + get :index, :lat => 4, :lon => 5 assert_redirected_to :controller => :site, :action => :index, :anchor => "map=5/4/5" @@ -199,6 +214,28 @@ class SiteControllerTest < ActionController::TestCase assert_template "index" end + # Test the right editor gets used when the URL has an override + def test_edit_with_override + get :edit, { :editor => "id" }, { :user => users(:public_user).id } + assert_response :success + assert_template "edit" + assert_template :partial => "_id", :count => 1 + + get :edit, { :editor => "potlatch2" }, { :user => users(:public_user).id } + assert_response :success + assert_template "edit" + assert_template :partial => "_potlatch2", :count => 1 + + get :edit, { :editor => "potlatch" }, { :user => users(:public_user).id } + assert_response :success + assert_template "edit" + assert_template :partial => "_potlatch", :count => 1 + + get :edit, { :editor => "remote" }, { :user => users(:public_user).id } + assert_response :success + assert_template "index" + end + # Test editing a specific node def test_edit_with_node user = users(:public_user) @@ -228,7 +265,7 @@ class SiteControllerTest < ActionController::TestCase # Test editing a specific note def test_edit_with_note user = users(:public_user) - note = notes(:open_note) + note = notes(:open_note) get :edit, { :note => note.id }, { :user => user.id } assert_response :success