X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c24c2e481cc6d27e76274ed4e32668a4690a7788..bc12774c21915687c07b93dbcbef78d28d2920af:/test/controllers/changesets_controller_test.rb?ds=sidebyside diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb index a5ce2aa62..31a1e2d0c 100644 --- a/test/controllers/changesets_controller_test.rb +++ b/test/controllers/changesets_controller_test.rb @@ -40,6 +40,9 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest assert_template "history" assert_template :layout => "map" assert_select "h2", :text => "Changesets", :count => 1 + assert_select "link[rel='alternate'][type='application/atom+xml']", :count => 1 do + assert_select "[href=?]", "http://www.example.com/history/feed" + end get history_path(:format => "html", :list => "1"), :xhr => true assert_response :success @@ -58,6 +61,9 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest assert_template "history" assert_template :layout => "xhr" assert_select "h2", :text => "Changesets", :count => 1 + assert_select "link[rel='alternate'][type='application/atom+xml']", :count => 1 do + assert_select "[href=?]", "http://www.example.com/history/feed" + end get history_path(:format => "html", :list => "1"), :xhr => true assert_response :success @@ -84,6 +90,9 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest assert_template "history" assert_template :layout => "map" assert_select "h2", :text => "Changesets", :count => 1 + assert_select "link[rel='alternate'][type='application/atom+xml']", :count => 1 do + assert_select "[href=?]", "http://www.example.com/history/feed?bbox=4.5%2C4.5%2C5.5%2C5.5" + end get history_path(:format => "html", :bbox => "4.5,4.5,5.5,5.5", :list => "1"), :xhr => true assert_response :success @@ -102,6 +111,11 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest get history_path(:format => "html", :display_name => user.display_name) assert_response :success assert_template "history" + assert_template :layout => "map" + assert_select "h2", :text => "Changesets by #{user.display_name}", :count => 1 + assert_select "link[rel='alternate'][type='application/atom+xml']", :count => 1 do + assert_select "[href=?]", "http://www.example.com/user/#{ERB::Util.url_encode(user.display_name)}/history/feed" + end get history_path(:format => "html", :display_name => user.display_name, :list => "1"), :xhr => true assert_response :success @@ -150,7 +164,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest get friend_changesets_path assert_response :redirect - assert_redirected_to :controller => :users, :action => :login, :referer => friend_changesets_path + assert_redirected_to login_path(:referer => friend_changesets_path) session_for(private_user) @@ -176,7 +190,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest get nearby_changesets_path assert_response :redirect - assert_redirected_to :controller => :users, :action => :login, :referer => nearby_changesets_path + assert_redirected_to login_path(:referer => nearby_changesets_path) session_for(private_user)