X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bf81e537ab0f6eca5e8fef3d6accbca3f09b3d8b..7a38523b364e5e799214cc668e426789202fcd03:/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 778a6024c..a486e4b5e 100644 --- a/test/controllers/changesets_controller_test.rb +++ b/test/controllers/changesets_controller_test.rb @@ -4,6 +4,10 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest ## # test all routes which lead to this controller def test_routes + assert_routing( + { :path => "/changeset/1", :method => :get }, + { :controller => "changesets", :action => "show", :id => "1" } + ) assert_routing( { :path => "/user/name/history", :method => :get }, { :controller => "changesets", :action => "index", :display_name => "name" } @@ -28,6 +32,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 ## @@ -72,6 +92,15 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest check_index_result(changesets.last(20)) end + ## + # This should report an error + def test_index_invalid_xhr + %w[-1 0 fred].each do |id| + get history_path(:format => "html", :list => "1", :max_id => id) + assert_redirected_to :controller => :errors, :action => :bad_request + end + end + ## # This should display the last 20 changesets closed in a specific area def test_index_bbox @@ -105,14 +134,17 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest # Checks the display of the user changesets listing def test_index_user user = create(:user) - create(:changeset, :user => user) - create(:changeset, :closed, :user => user) + create(:changeset, :user => user, :num_changes => 1) + create(:changeset, :closed, :user => user, :num_changes => 1) + user.reload 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 "h2", :text => "Changesets by #{user.display_name}", :count => 1 do + assert_select "a[href=?]", user_path(user) + end 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 @@ -163,7 +195,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest _changeset2 = create(:changeset, :user => create(:user), :num_changes => 1) get friend_changesets_path - assert_response :redirect assert_redirected_to login_path(:referer => friend_changesets_path) session_for(private_user) @@ -189,7 +220,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest _changeset2 = create(:changeset, :user => far_away_user, :num_changes => 1) get nearby_changesets_path - assert_response :redirect assert_redirected_to login_path(:referer => nearby_changesets_path) session_for(private_user) @@ -236,6 +266,90 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest assert_response :success end + def test_show + changeset = create(:changeset) + create(:changeset_tag, :changeset => changeset, :k => "comment", :v => "tested-changeset-comment") + commenting_user = create(:user) + changeset_comment = create(:changeset_comment, :changeset => changeset, :author => commenting_user, :body => "Unwanted comment") + + sidebar_browse_check :changeset_path, changeset.id, "changesets/show" + assert_dom "h2", :text => "Changeset: #{changeset.id}" + assert_dom "p", :text => "tested-changeset-comment" + assert_dom "li#c#{changeset_comment.id}" do + assert_dom "> small", :text => /^Comment from #{commenting_user.display_name}/ + assert_dom "a[href='#{user_path(commenting_user)}']" + end + end + + def test_show_closed_changeset + changeset = create(:changeset, :closed) + + sidebar_browse_check :changeset_path, changeset.id, "changesets/show" + end + + def test_show_private_changeset + user = create(:user) + changeset = create(:changeset, :user => create(:user, :data_public => false)) + create(:changeset, :user => user) + + sidebar_browse_check :changeset_path, changeset.id, "changesets/show" + end + + def test_show_element_links + changeset = create(:changeset) + node = create(:node, :with_history, :changeset => changeset) + way = create(:way, :with_history, :changeset => changeset) + relation = create(:relation, :with_history, :changeset => changeset) + + sidebar_browse_check :changeset_path, changeset.id, "changesets/show" + assert_dom "a[href='#{node_path node}']", :count => 1 + assert_dom "a[href='#{old_node_path node, 1}']", :count => 1 + assert_dom "a[href='#{way_path way}']", :count => 1 + assert_dom "a[href='#{old_way_path way, 1}']", :count => 1 + assert_dom "a[href='#{relation_path relation}']", :count => 1 + assert_dom "a[href='#{old_relation_path relation, 1}']", :count => 1 + end + + def test_show_paginated_element_links + page_size = 20 + changeset = create(:changeset) + nodes = create_list(:node, page_size + 1, :with_history, :changeset => changeset) + ways = create_list(:way, page_size + 1, :with_history, :changeset => changeset) + relations = create_list(:relation, page_size + 1, :with_history, :changeset => changeset) + + sidebar_browse_check :changeset_path, changeset.id, "changesets/show" + page_size.times do |i| + assert_dom "a[href='#{node_path nodes[i]}']", :count => 1 + assert_dom "a[href='#{old_node_path nodes[i], 1}']", :count => 1 + assert_dom "a[href='#{way_path ways[i]}']", :count => 1 + assert_dom "a[href='#{old_way_path ways[i], 1}']", :count => 1 + assert_dom "a[href='#{relation_path relations[i]}']", :count => 1 + assert_dom "a[href='#{old_relation_path relations[i], 1}']", :count => 1 + end + end + + def test_show_adjacent_changesets + user = create(:user) + changesets = create_list(:changeset, 3, :user => user, :num_changes => 1) + + sidebar_browse_check :changeset_path, changesets[1].id, "changesets/show" + assert_dom "a[href='#{changeset_path changesets[0]}']", :count => 1 + assert_dom "a[href='#{changeset_path changesets[2]}']", :count => 1 + end + + def test_show_adjacent_nonempty_changesets + user = create(:user) + changeset1 = create(:changeset, :user => user, :num_changes => 1) + create(:changeset, :user => user, :num_changes => 0) + changeset3 = create(:changeset, :user => user, :num_changes => 1) + create(:changeset, :user => user, :num_changes => 0) + changeset5 = create(:changeset, :user => user, :num_changes => 1) + + sidebar_browse_check :changeset_path, changeset3.id, "changesets/show" + assert_dom "a[href='#{changeset_path changeset1}']", :count => 1 + assert_dom "a[href='#{changeset_path changeset5}']", :count => 1 + end + ## # This should display the last 20 non-empty changesets def test_feed @@ -254,9 +368,11 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest 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 => "tested-changeset-comment") + create(:changeset_tag, :changeset => changeset, :k => "comment", :v => "testedcomment") get history_feed_path(:format => :atom) assert_response :success @@ -313,10 +429,122 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest # Check that we can't request later pages of the changesets feed def test_feed_max_id get history_feed_path(:format => "atom", :max_id => 100) - assert_response :redirect assert_redirected_to :action => :feed end + def test_subscribe_page + user = create(:user) + other_user = create(:user) + changeset = create(:changeset, :user => user) + path = subscribe_changeset_path(changeset) + + get path + 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 subscribe_changeset_path(changeset) + end + 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 subscribe_changeset_path(changeset) + end + assert_response :forbidden + + session_for(other_user) + + # bad diary id + post subscribe_changeset_path(999111) + assert_response :not_found + + # trying to subscribe when already subscribed + post subscribe_changeset_path(changeset) + assert_no_difference "changeset.subscribers.count" do + post subscribe_changeset_path(changeset) + end + end + + def test_unsubscribe_page + user = create(:user) + other_user = create(:user) + changeset = create(:changeset, :user => user) + path = unsubscribe_changeset_path(changeset) + + get path + 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 unsubscribe_changeset_path(changeset) + end + 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 unsubscribe_changeset_path(changeset) + end + assert_response :forbidden + + session_for(other_user) + + # bad diary id + post unsubscribe_changeset_path(999111) + assert_response :not_found + + # trying to unsubscribe when not subscribed + assert_no_difference "changeset.subscribers.count" do + post unsubscribe_changeset_path(changeset) + end + end + private ##