X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8e5deafd854b05086296513b318df1626dc41967..437eb1fa8a518e760d76e51a1ab6ddd20c39ffc9:/test/controllers/changesets_controller_test.rb

diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb
index 31a1e2d0c..007a5d679 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" }
@@ -72,11 +76,23 @@ 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", :before => id)
+      assert_redirected_to :controller => :errors, :action => :bad_request
+
+      get history_path(:format => "html", :list => "1", :after => 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
-    changesets = create_list(:changeset, 10, :num_changes => 1, :min_lat => 50000000, :max_lat => 50000001, :min_lon => 50000000, :max_lon => 50000001)
-    other_changesets = create_list(:changeset, 10, :num_changes => 1, :min_lat => 0, :max_lat => 1, :min_lon => 0, :max_lon => 1)
+    changesets = create_list(:changeset, 10, :num_changes => 1, :bbox => [5, 5, 5, 5])
+    other_changesets = create_list(:changeset, 10, :num_changes => 1, :bbox => [0, 0, 1, 1])
 
     # First check they all show up without a bbox parameter
     get history_path(:format => "html", :list => "1"), :xhr => true
@@ -101,18 +117,142 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     check_index_result(changesets)
   end
 
+  def test_index_bbox_across_antimeridian_with_changesets_close_to_antimeridian
+    west_of_antimeridian_changeset = create(:changeset, :num_changes => 1, :bbox => [176, 0, 178, 1])
+    east_of_antimeridian_changeset = create(:changeset, :num_changes => 1, :bbox => [-178, 0, -176, 1])
+
+    get history_path(:format => "html", :list => "1")
+    assert_response :success
+    check_index_result([east_of_antimeridian_changeset, west_of_antimeridian_changeset])
+
+    # negative longitudes
+    get history_path(:format => "html", :list => "1", :bbox => "-190,-10,-170,10")
+    assert_response :success
+    check_index_result([east_of_antimeridian_changeset, west_of_antimeridian_changeset])
+
+    get history_path(:format => "html", :list => "1", :bbox => "-183,-10,-177,10")
+    assert_response :success
+    check_index_result([east_of_antimeridian_changeset, west_of_antimeridian_changeset])
+
+    get history_path(:format => "html", :list => "1", :bbox => "-181,-10,-177,10")
+    assert_response :success
+    check_index_result([east_of_antimeridian_changeset])
+
+    get history_path(:format => "html", :list => "1", :bbox => "-183,-10,-179,10")
+    assert_response :success
+    check_index_result([west_of_antimeridian_changeset])
+
+    get history_path(:format => "html", :list => "1", :bbox => "-181,-10,-179,10")
+    assert_response :success
+    check_index_result([])
+
+    # positive longitudes
+    get history_path(:format => "html", :list => "1", :bbox => "170,-10,190,10")
+    assert_response :success
+    check_index_result([east_of_antimeridian_changeset, west_of_antimeridian_changeset])
+
+    get history_path(:format => "html", :list => "1", :bbox => "177,-10,183,10")
+    assert_response :success
+    check_index_result([east_of_antimeridian_changeset, west_of_antimeridian_changeset])
+
+    get history_path(:format => "html", :list => "1", :bbox => "177,-10,181,10")
+    assert_response :success
+    check_index_result([west_of_antimeridian_changeset])
+
+    get history_path(:format => "html", :list => "1", :bbox => "179,-10,183,10")
+    assert_response :success
+    check_index_result([east_of_antimeridian_changeset])
+
+    get history_path(:format => "html", :list => "1", :bbox => "179,-10,181,10")
+    assert_response :success
+    check_index_result([])
+  end
+
+  def test_index_bbox_across_antimeridian_with_changesets_around_globe
+    changeset1 = create(:changeset, :num_changes => 1, :bbox => [-150, 40, -140, 50])
+    changeset2 = create(:changeset, :num_changes => 1, :bbox => [-30, -30, -20, -20])
+    changeset3 = create(:changeset, :num_changes => 1, :bbox => [10, 60, 20, 70])
+    changeset4 = create(:changeset, :num_changes => 1, :bbox => [150, -60, 160, -50])
+
+    # no bbox, get all changesets
+    get history_path(:format => "html", :list => "1")
+    assert_response :success
+    check_index_result([changeset4, changeset3, changeset2, changeset1])
+
+    # large enough bbox within normal range
+    get history_path(:format => "html", :list => "1", :bbox => "-170,-80,170,80")
+    assert_response :success
+    check_index_result([changeset4, changeset3, changeset2, changeset1])
+
+    # bbox for [1,2] within normal range
+    get history_path(:format => "html", :list => "1", :bbox => "-160,-80,0,80")
+    assert_response :success
+    check_index_result([changeset2, changeset1])
+
+    # bbox for [1,4] containing antimeridian with negative lon
+    get history_path(:format => "html", :list => "1", :bbox => "-220,-80,-100,80")
+    assert_response :success
+    check_index_result([changeset4, changeset1])
+
+    # bbox for [1,4] containing antimeridian with positive lon
+    get history_path(:format => "html", :list => "1", :bbox => "100,-80,220,80")
+    assert_response :success
+    check_index_result([changeset4, changeset1])
+
+    # large enough bbox outside normal range
+    get history_path(:format => "html", :list => "1", :bbox => "-220,-80,220,80")
+    assert_response :success
+    check_index_result([changeset4, changeset3, changeset2, changeset1])
+  end
+
+  ##
+  # Test that -180..180 longitudes don't result in empty bbox
+  def test_index_bbox_entire_world
+    changeset = create(:changeset, :num_changes => 1, :bbox => [30, 60, 31, 61])
+
+    get history_path(:format => "html", :list => "1", :bbox => "-180,-80,-180,80")
+    assert_response :success
+    check_index_result([])
+
+    get history_path(:format => "html", :list => "1", :bbox => "180,-80,180,80")
+    assert_response :success
+    check_index_result([])
+
+    get history_path(:format => "html", :list => "1", :bbox => "-180,-80,180,80")
+    assert_response :success
+    check_index_result([changeset])
+  end
+
+  ##
+  # Test that -270..270 longitudes don't result in 90..-90 bbox
+  def test_index_bbox_larger_than_entire_world
+    changeset1 = create(:changeset, :num_changes => 1, :bbox => [30, 60, 31, 61])
+    changeset2 = create(:changeset, :num_changes => 1, :bbox => [130, 60, 131, 61])
+
+    get history_path(:format => "html", :list => "1", :bbox => "-90,-80,90,80")
+    assert_response :success
+    check_index_result([changeset1])
+
+    get history_path(:format => "html", :list => "1", :bbox => "-270,-80,270,80")
+    assert_response :success
+    check_index_result([changeset2, changeset1])
+  end
+
   ##
   # 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
@@ -158,12 +298,11 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
   # Checks the display of the friends changesets listing
   def test_index_friends
     private_user = create(:user, :data_public => true)
-    friendship = create(:friendship, :befriender => private_user)
-    changeset = create(:changeset, :user => friendship.befriendee, :num_changes => 1)
+    follow = create(:follow, :follower => private_user)
+    changeset = create(:changeset, :user => follow.following, :num_changes => 1)
     _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 +328,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)
@@ -207,21 +345,38 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
 
   ##
   # Check that we can't request later pages of the changesets index
-  def test_index_max_id
-    changeset = create(:changeset, :num_changes => 1)
-    _changeset2 = create(:changeset, :num_changes => 1)
+  def test_index_before_id
+    changeset1 = create(:changeset, :num_changes => 1)
+    changeset2 = create(:changeset, :num_changes => 1)
 
-    get history_path(:format => "html", :max_id => changeset.id), :xhr => true
+    get history_path(:format => "html", :before => changeset2.id), :xhr => true
     assert_response :success
     assert_template "history"
     assert_template :layout => "xhr"
     assert_select "h2", :text => "Changesets", :count => 1
 
-    get history_path(:format => "html", :list => "1", :max_id => changeset.id), :xhr => true
+    get history_path(:format => "html", :list => "1", :before => changeset2.id), :xhr => true
     assert_response :success
     assert_template "index"
 
-    check_index_result([changeset])
+    check_index_result [changeset1]
+  end
+
+  def test_index_after_id
+    changeset1 = create(:changeset, :num_changes => 1)
+    changeset2 = create(:changeset, :num_changes => 1)
+
+    get history_path(:format => "html", :after => changeset1.id), :xhr => true
+    assert_response :success
+    assert_template "history"
+    assert_template :layout => "xhr"
+    assert_select "h2", :text => "Changesets", :count => 1
+
+    get history_path(:format => "html", :list => "1", :after => changeset1.id), :xhr => true
+    assert_response :success
+    assert_template "index"
+
+    check_index_result [changeset2]
   end
 
   ##
@@ -236,6 +391,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 "article#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
@@ -243,6 +482,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)
@@ -250,25 +490,39 @@ 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 => "tested<changeset>comment")
+
+    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
 
   ##
   # This should display the last 20 changesets closed in a specific area
   def test_feed_bbox
-    changeset = create(:changeset, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE)
+    changeset = create(:changeset, :num_changes => 1, :bbox => [5, 5, 5, 5])
     create(:changeset_tag, :changeset => changeset)
     create(:changeset_tag, :changeset => changeset, :k => "website", :v => "http://example.com/")
-    closed_changeset = create(:changeset, :closed, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE)
-    _elsewhere_changeset = create(:changeset, :num_changes => 1, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)
-    _empty_changeset = create(:changeset, :num_changes => 0, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)
+    closed_changeset = create(:changeset, :closed, :num_changes => 1, :bbox => [5, 5, 5, 5])
+    _elsewhere_changeset = create(:changeset, :num_changes => 1, :bbox => [-5, -5, -5, -5])
+    _empty_changeset = create(:changeset, :num_changes => 0, :bbox => [5, 5, 5, 5])
 
     get history_feed_path(:format => :atom, :bbox => "4.5,4.5,5.5,5.5")
     assert_response :success
     assert_template "index"
     assert_equal "application/atom+xml", response.media_type
 
-    check_feed_result([changeset, closed_changeset])
+    check_feed_result([closed_changeset, changeset])
   end
 
   ##
@@ -286,7 +540,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
 
   ##
@@ -298,9 +552,13 @@ 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
+  def test_feed_before
+    get history_feed_path(:format => "atom", :before => 100)
+    assert_redirected_to :action => :feed
+  end
+
+  def test_feed_after
+    get history_feed_path(:format => "atom", :after => 100)
     assert_redirected_to :action => :feed
   end
 
@@ -321,14 +579,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