X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c24c2e481cc6d27e76274ed4e32668a4690a7788..a1a6c577e8f406c0d0fa31326209c98ebd78954d:/test/controllers/changesets_controller_test.rb diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb index a5ce2aa62..a0747a0cd 100644 --- a/test/controllers/changesets_controller_test.rb +++ b/test/controllers/changesets_controller_test.rb @@ -28,6 +28,22 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest { :path => "/history/feed", :method => :get }, { :controller => "changesets", :action => "feed", :format => :atom } ) + assert_routing( + { :path => "/changeset/1/subscribe", :method => :get }, + { :controller => "changesets", :action => "subscribe", :id => "1" } + ) + assert_routing( + { :path => "/changeset/1/subscribe", :method => :post }, + { :controller => "changesets", :action => "subscribe", :id => "1" } + ) + assert_routing( + { :path => "/changeset/1/unsubscribe", :method => :get }, + { :controller => "changesets", :action => "unsubscribe", :id => "1" } + ) + assert_routing( + { :path => "/changeset/1/unsubscribe", :method => :post }, + { :controller => "changesets", :action => "unsubscribe", :id => "1" } + ) end ## @@ -40,6 +56,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 +77,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 +106,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 +127,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 +180,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 +206,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) @@ -229,6 +259,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest create(:changeset_tag, :changeset => changeset) create(:changeset_tag, :changeset => changeset, :k => "website", :v => "http://example.com/") closed_changeset = create(:changeset, :closed, :num_changes => 1) + create(:changeset_tag, :changeset => closed_changeset, :k => "website", :v => "https://osm.org/") _empty_changeset = create(:changeset, :num_changes => 0) get history_feed_path(:format => :atom) @@ -236,7 +267,21 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest assert_template "index" assert_equal "application/atom+xml", response.media_type - check_feed_result([changeset, closed_changeset]) + check_feed_result([closed_changeset, changeset]) + end + + ## + # This should correctly escape XML special characters in the comment + def test_feed_with_comment_tag + changeset = create(:changeset, :num_changes => 1) + create(:changeset_tag, :changeset => changeset, :k => "comment", :v => "testedcomment") + + get history_feed_path(:format => :atom) + assert_response :success + assert_template "index" + assert_equal "application/atom+xml", response.media_type + + check_feed_result([changeset]) end ## @@ -254,7 +299,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest assert_template "index" assert_equal "application/atom+xml", response.media_type - check_feed_result([changeset, closed_changeset]) + check_feed_result([closed_changeset, changeset]) end ## @@ -272,7 +317,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest assert_template "index" assert_equal "application/atom+xml", response.media_type - check_feed_result(changesets) + check_feed_result(changesets.reverse) end ## @@ -290,6 +335,123 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest assert_redirected_to :action => :feed end + def test_subscribe_page + user = create(:user) + other_user = create(:user) + changeset = create(:changeset, :user => user) + path = changeset_subscribe_path(changeset) + + get path + assert_response :redirect + assert_redirected_to login_path(:referer => path) + + session_for(other_user) + get path + assert_response :success + assert_dom ".content-body" do + assert_dom "a[href='#{changeset_path(changeset)}']", :text => "Changeset #{changeset.id}" + assert_dom "a[href='#{user_path(user)}']", :text => user.display_name + end + end + + def test_subscribe_success + user = create(:user) + other_user = create(:user) + changeset = create(:changeset, :user => user) + + session_for(other_user) + assert_difference "changeset.subscribers.count", 1 do + post changeset_subscribe_path(changeset) + end + assert_response :redirect + assert_redirected_to changeset_path(changeset) + assert changeset.reload.subscribed?(other_user) + end + + def test_subscribe_fail + user = create(:user) + other_user = create(:user) + + changeset = create(:changeset, :user => user) + + # not signed in + assert_no_difference "changeset.subscribers.count" do + post changeset_subscribe_path(changeset) + end + assert_response :forbidden + + session_for(other_user) + + # bad diary id + post changeset_subscribe_path(999111) + assert_response :not_found + + # trying to subscribe when already subscribed + post changeset_subscribe_path(changeset) + assert_no_difference "changeset.subscribers.count" do + post changeset_subscribe_path(changeset) + end + end + + def test_unsubscribe_page + user = create(:user) + other_user = create(:user) + changeset = create(:changeset, :user => user) + path = changeset_unsubscribe_path(changeset) + + get path + assert_response :redirect + assert_redirected_to login_path(:referer => path) + + session_for(other_user) + get path + assert_response :success + assert_dom ".content-body" do + assert_dom "a[href='#{changeset_path(changeset)}']", :text => "Changeset #{changeset.id}" + assert_dom "a[href='#{user_path(user)}']", :text => user.display_name + end + end + + def test_unsubscribe_success + user = create(:user) + other_user = create(:user) + + changeset = create(:changeset, :user => user) + changeset.subscribers.push(other_user) + + session_for(other_user) + assert_difference "changeset.subscribers.count", -1 do + post changeset_unsubscribe_path(changeset) + end + assert_response :redirect + assert_redirected_to changeset_path(changeset) + assert_not changeset.reload.subscribed?(other_user) + end + + def test_unsubscribe_fail + user = create(:user) + other_user = create(:user) + + changeset = create(:changeset, :user => user) + + # not signed in + assert_no_difference "changeset.subscribers.count" do + post changeset_unsubscribe_path(changeset) + end + assert_response :forbidden + + session_for(other_user) + + # bad diary id + post changeset_unsubscribe_path(999111) + assert_response :not_found + + # trying to unsubscribe when not subscribed + assert_no_difference "changeset.subscribers.count" do + post changeset_unsubscribe_path(changeset) + end + end + private ## @@ -307,14 +469,33 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest ## # check the result of a feed def check_feed_result(changesets) - assert changesets.size <= 20 + assert_operator changesets.size, :<=, 20 assert_select "feed", :count => [changesets.size, 1].min do assert_select "> title", :count => 1, :text => /^Changesets/ - assert_select "> entry", :count => changesets.size - - changesets.each do |changeset| - assert_select "> entry > id", changeset_url(:id => changeset.id) + assert_select "> entry", :count => changesets.size do |entries| + entries.zip(changesets) do |entry, changeset| + assert_select entry, "> id", :text => changeset_url(:id => changeset.id) + + changeset_comment = changeset.tags["comment"] + if changeset_comment + assert_select entry, "> title", :count => 1, :text => "Changeset #{changeset.id} - #{changeset_comment}" + else + assert_select entry, "> title", :count => 1, :text => "Changeset #{changeset.id}" + end + + assert_select entry, "> content > xhtml|div > xhtml|table" do + if changeset.tags.empty? + assert_select "> xhtml|tr > xhtml|td > xhtml|table", :count => 0 + else + assert_select "> xhtml|tr > xhtml|td > xhtml|table", :count => 1 do + changeset.tags.each_key do |key| + assert_select "> xhtml|tr > xhtml|td", :text => /^#{key} = / + end + end + end + end + end end end end