X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/14ac1babc2517320a2c90fa9b4ac36a5a6e68018..34e3e51456774127d43408b7ab65c24f41373f62:/test/controllers/changeset_controller_test.rb?ds=sidebyside

diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb
index c3fd0fadc..b3d6d7eb2 100644
--- a/test/controllers/changeset_controller_test.rb
+++ b/test/controllers/changeset_controller_test.rb
@@ -3,7 +3,7 @@ require 'changeset_controller'
 
 class ChangesetControllerTest < ActionController::TestCase
   api_fixtures
-  fixtures :changeset_comments
+  fixtures :changeset_comments, :changesets_subscribers
 
   ##
   # test all routes which lead to this controller
@@ -29,41 +29,41 @@ class ChangesetControllerTest < ActionController::TestCase
       { :controller => "changeset", :action => "read", :id => "1" }
     )
     assert_routing(
-      { :path => "/api/0.6/changeset/1", :method => :put },
-      { :controller => "changeset", :action => "update", :id => "1" }
+      { :path => "/api/0.6/changeset/1/subscribe", :method => :post },
+      { :controller => "changeset", :action => "subscribe", :id => "1" }
     )
     assert_routing(
-      { :path => "/api/0.6/changeset/1/close", :method => :put },
-      { :controller => "changeset", :action => "close", :id => "1" }
+      { :path => "/api/0.6/changeset/1/unsubscribe", :method => :post },
+      { :controller => "changeset", :action => "unsubscribe", :id => "1" }
     )
     assert_routing(
-        { :path => "/api/0.6/changeset/1/subscribe", :method => :post },
-        { :controller => "changeset", :action => "subscribe", :id => "1" }
-    )
-    assert_routing(
-        { :path => "/api/0.6/changeset/1/unsubscribe", :method => :post },
-        { :controller => "changeset", :action => "unsubscribe", :id => "1" }
+      { :path => "/api/0.6/changeset/1", :method => :put },
+      { :controller => "changeset", :action => "update", :id => "1" }
     )
     assert_routing(
-        { :path => "/api/0.6/changeset/comment/1/hide", :method => :post },
-        { :controller => "changeset", :action => "hide_comment", :id => "1" }
+      { :path => "/api/0.6/changeset/1/close", :method => :put },
+      { :controller => "changeset", :action => "close", :id => "1" }
     )
     assert_routing(
-        { :path => "/api/0.6/changeset/comment/1/unhide", :method => :post },
-        { :controller => "changeset", :action => "unhide_comment", :id => "1" }
+      { :path => "/api/0.6/changeset/1/comment", :method => :post },
+      { :controller => "changeset", :action => "comment", :id => "1" }
     )
     assert_routing(
-        { :path => "/api/0.6/changeset/comments/feed", :method => :get },
-        { :controller => "changeset", :action => "comments_feed", :format =>"rss" }
+      { :path => "/api/0.6/changeset/comment/1/hide", :method => :post },
+      { :controller => "changeset", :action => "hide_comment", :id => "1" }
     )
     assert_routing(
-        { :path => "/api/0.6/changeset/1/comments/feed", :method => :get },
-        { :controller => "changeset", :action => "comments_feed", :id => "1", :format =>"rss" }
+      { :path => "/api/0.6/changeset/comment/1/unhide", :method => :post },
+      { :controller => "changeset", :action => "unhide_comment", :id => "1" }
     )
     assert_routing(
       { :path => "/api/0.6/changesets", :method => :get },
       { :controller => "changeset", :action => "query" }
     )
+    assert_routing(
+      { :path => "/changeset/1/comments/feed", :method => :get },
+      { :controller => "changeset", :action => "comments_feed", :id => "1", :format =>"rss" }
+    )
     assert_routing(
       { :path => "/user/name/history", :method => :get },
       { :controller => "changeset", :action => "list", :display_name => "name" }
@@ -88,6 +88,10 @@ class ChangesetControllerTest < ActionController::TestCase
       { :path => "/history/feed", :method => :get },
       { :controller => "changeset", :action => "feed", :format => :atom }
     )
+    assert_routing(
+      { :path => "/history/comments/feed", :method => :get },
+      { :controller => "changeset", :action => "comments_feed", :format =>"rss" }
+    )
   end
 
   # -----------------------
@@ -177,14 +181,18 @@ class ChangesetControllerTest < ActionController::TestCase
   # document structure.
   def test_read
     changeset_id = changesets(:normal_user_first_change).id
-    get :read, :id => changeset_id, :format => :xml
+    get :read, :id => changeset_id
     assert_response :success, "cannot get first changeset"
 
-    assert_select "osm[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1
-    assert_select "osm>changeset[id=#{changeset_id}]", 1
+    assert_select "osm[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1
+    assert_select "osm>changeset[id='#{changeset_id}']", 1
     assert_select "osm>changeset>discussion", 0
 
-    get :read, :id => changeset_id, :format => :xml, :include_discussion => true
+    get :read, :id => changeset_id, :include_discussion => true
+    assert_response :success, "cannot get first changeset with comments"
+
+    assert_select "osm[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1
+    assert_select "osm>changeset[id='#{changeset_id}']", 1
     assert_select "osm>changeset>discussion", 1
   end
 
@@ -417,9 +425,9 @@ EOF
       "can't upload a simple valid creation to changeset: #{@response.body}"
 
     # check the returned payload
-    assert_select "diffResult[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1
+    assert_select "diffResult[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1
     assert_select "diffResult>node", 1
-    assert_select "diffresult>way", 1
+    assert_select "diffResult>way", 1
     assert_select "diffResult>relation", 1
 
     # inspect the response to find out what the new element IDs are
@@ -623,9 +631,9 @@ EOF
       "can't do a conditional delete of in use objects: #{@response.body}"
 
     # check the returned payload
-    assert_select "diffResult[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1
+    assert_select "diffResult[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1
     assert_select "diffResult>node", 1
-    assert_select "diffresult>way", 1
+    assert_select "diffResult>way", 1
     assert_select "diffResult>relation", 1
 
     # parse the response
@@ -714,7 +722,7 @@ EOF
       "can't upload a complex diff to changeset: #{@response.body}"
 
     # check the returned payload
-    assert_select "diffResult[version=#{API_VERSION}][generator=\"#{GENERATOR}\"]", 1
+    assert_select "diffResult[version='#{API_VERSION}'][generator='#{GENERATOR}']", 1
     assert_select "diffResult>node", 1
     assert_select "diffResult>way", 1
     assert_select "diffResult>relation", 1
@@ -946,7 +954,7 @@ EOF
 
     # check the response is well-formed
     assert_select "diffResult>node", 3
-    assert_select "diffResult>node[old_id=-1]", 3
+    assert_select "diffResult>node[old_id='-1']", 3
   end
 
   ##
@@ -1199,7 +1207,7 @@ EOF
       "failed to return error in XML format"
 
     # check the returned payload
-    assert_select "osmError[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1
+    assert_select "osmError[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1
     assert_select "osmError>status", 1
     assert_select "osmError>message", 1
 
@@ -1387,10 +1395,10 @@ EOF
     # FIXME needs more assert_select tests
     assert_select "osmChange[version='#{API_VERSION}'][generator='#{GENERATOR}']" do
       assert_select "create", :count => 5
-      assert_select "create>node[id=#{nodes(:used_node_2).node_id}][visible=#{nodes(:used_node_2).visible?}][version=#{nodes(:used_node_2).version}]" do
-        assert_select "tag[k=#{node_tags(:t3).k}][v=#{node_tags(:t3).v}]"
+      assert_select "create>node[id='#{nodes(:used_node_2).node_id}'][visible='#{nodes(:used_node_2).visible?}'][version='#{nodes(:used_node_2).version}']" do
+        assert_select "tag[k='#{node_tags(:t3).k}'][v='#{node_tags(:t3).v}']"
       end
-      assert_select "create>node[id=#{nodes(:visible_node).node_id}]"
+      assert_select "create>node[id='#{nodes(:visible_node).node_id}']"
     end
   end
 
@@ -1414,13 +1422,12 @@ EOF
     end
 
     # get the bounding box back from the changeset
-    get :read, :id => changeset_id, :format => :xml
-
+    get :read, :id => changeset_id
     assert_response :success, "Couldn't read back changeset."
-    assert_select "osm>changeset[min_lon=1.0]", 1
-    assert_select "osm>changeset[max_lon=1.0]", 1
-    assert_select "osm>changeset[min_lat=2.0]", 1
-    assert_select "osm>changeset[max_lat=2.0]", 1
+    assert_select "osm>changeset[min_lon='1.0']", 1
+    assert_select "osm>changeset[max_lon='1.0']", 1
+    assert_select "osm>changeset[min_lat='2.0']", 1
+    assert_select "osm>changeset[max_lat='2.0']", 1
 
     # add another node to it
     with_controller(NodeController.new) do
@@ -1430,12 +1437,12 @@ EOF
     end
 
     # get the bounding box back from the changeset
-    get :read, :id => changeset_id, :format => :xml
+    get :read, :id => changeset_id
     assert_response :success, "Couldn't read back changeset for the second time."
-    assert_select "osm>changeset[min_lon=1.0]", 1
-    assert_select "osm>changeset[max_lon=2.0]", 1
-    assert_select "osm>changeset[min_lat=1.0]", 1
-    assert_select "osm>changeset[max_lat=2.0]", 1
+    assert_select "osm>changeset[min_lon='1.0']", 1
+    assert_select "osm>changeset[max_lon='2.0']", 1
+    assert_select "osm>changeset[min_lat='1.0']", 1
+    assert_select "osm>changeset[max_lat='2.0']", 1
 
     # add (delete) a way to it, which contains a point at (3,3)
     with_controller(WayController.new) do
@@ -1446,13 +1453,13 @@ EOF
     end
 
     # get the bounding box back from the changeset
-    get :read, :id => changeset_id, :format => 'xml'
+    get :read, :id => changeset_id
     assert_response :success, "Couldn't read back changeset for the third time."
     # note that the 3.1 here is because of the bbox overexpansion
-    assert_select "osm>changeset[min_lon=1.0]", 1
-    assert_select "osm>changeset[max_lon=3.1]", 1
-    assert_select "osm>changeset[min_lat=1.0]", 1
-    assert_select "osm>changeset[max_lat=3.1]", 1
+    assert_select "osm>changeset[min_lon='1.0']", 1
+    assert_select "osm>changeset[max_lon='3.1']", 1
+    assert_select "osm>changeset[min_lat='1.0']", 1
+    assert_select "osm>changeset[max_lat='3.1']", 1
   end
 
   ##
@@ -1535,11 +1542,11 @@ EOF
     basic_authorization "test@openstreetmap.org", "test"
     get :query, :user => users(:normal_user).id
     assert_response :success, "can't get changesets by user ID"
-    assert_changesets [1,3,6]
+    assert_changesets [1,3,6,8]
 
     get :query, :display_name => users(:normal_user).display_name
     assert_response :success, "can't get changesets by user name"
-    assert_changesets [1,3,6]
+    assert_changesets [1,3,6,8]
 
     # check that the correct error is given when we provide both UID and name
     get :query, :user => users(:normal_user).id, :display_name => users(:normal_user).display_name
@@ -1567,11 +1574,11 @@ EOF
 
     get :query, :closed => 'true'
     assert_response :success, "can't get changesets by closed-ness"
-    assert_changesets [3,5,6,7]
+    assert_changesets [3,5,6,7,8]
 
     get :query, :closed => 'true', :user => users(:normal_user).id
     assert_response :success, "can't get changesets by closed-ness and user"
-    assert_changesets [3,6]
+    assert_changesets [3,6,8]
 
     get :query, :closed => 'true', :user => users(:public_user).id
     assert_response :success, "can't get changesets by closed-ness and user"
@@ -1668,9 +1675,9 @@ EOF
     put :update, :id => changeset.id
     assert_response :success
 
-    assert_select "osm>changeset[id=#{changeset.id}]", 1
+    assert_select "osm>changeset[id='#{changeset.id}']", 1
     assert_select "osm>changeset>tag", 2
-    assert_select "osm>changeset>tag[k=tagtesting][v=valuetesting]", 1
+    assert_select "osm>changeset>tag[k='tagtesting'][v='valuetesting']", 1
   end
 
   ##
@@ -1869,8 +1876,8 @@ EOF
     assert_select "osmChange", 1
     # this changeset contains node 17 in versions 1 & 2, but 1 should
     # be hidden.
-    assert_select "osmChange node[id=17]", 1
-    assert_select "osmChange node[id=17][version=1]", 0
+    assert_select "osmChange node[id='17']", 1
+    assert_select "osmChange node[id='17'][version='1']", 0
   end
 
   ##
@@ -1879,7 +1886,7 @@ EOF
     basic_authorization(users(:public_user).email, 'test')
 
     assert_difference('ChangesetComment.count') do
-      post :comment, { :id => changesets(:normal_user_closed_change).id, :text => 'This is a comment', :format => :xml }
+      post :comment, { :id => changesets(:normal_user_closed_change).id, :text => 'This is a comment' }
     end
     assert_response :success
   end
@@ -1915,7 +1922,7 @@ EOF
     assert_no_difference('ChangesetComment.count') do
       post :comment, { :id => changesets(:normal_user_closed_change).id, :text => '' }
     end
-    assert_response :bad_request    
+    assert_response :bad_request
   end
 
   ##
@@ -1925,7 +1932,7 @@ EOF
     changeset = changesets(:normal_user_closed_change)
 
     assert_difference('changeset.subscribers.count') do
-      post :subscribe, { :id => changeset.id, :format => :xml }
+      post :subscribe, { :id => changeset.id }
     end
     assert_response :success
   end
@@ -1933,33 +1940,32 @@ EOF
   ##
   # test subscribe fail
   def test_subscribe_fail
+    # unauthorized
     changeset = changesets(:normal_user_closed_change)
     assert_no_difference('changeset.subscribers.count') do
-      post :subscribe, { :id => changeset.id, :format => :xml }
+      post :subscribe, { :id => changeset.id }
     end
     assert_response :unauthorized
 
     basic_authorization(users(:public_user).email, 'test')
 
+    # bad changeset id
     assert_no_difference('changeset.subscribers.count') do
       post :subscribe, { :id => 999111 }
     end
     assert_response :not_found
 
+    # not closed changeset
     changeset = changesets(:normal_user_first_change)
     assert_no_difference('changeset.subscribers.count') do
       post :subscribe, { :id => changeset.id }
     end
     assert_response :conflict
 
-    # subscribing
-    changeset = changesets(:normal_user_closed_change)
-    post :subscribe, { :id => changeset.id, :format => :xml }
-    assert_response :success
-
-    # trying to subsrcirbe one more time
+    # trying to subscribe when already subscribed
+    changeset = changesets(:normal_user_subscribed_change)
     assert_no_difference('changeset.subscribers.count') do
-      post :subscribe, { :id => changeset.id, :format => :xml }
+      post :subscribe, { :id => changeset.id }
     end
     assert_response :conflict
   end
@@ -1968,11 +1974,10 @@ EOF
   # test unsubscribe success
   def test_unsubscribe_success
     basic_authorization(users(:public_user).email, 'test')
-    changeset = changesets(:normal_user_closed_change)
-    post :subscribe, { :id => changeset.id, :format => :xml }
-    # unsubscribe
+    changeset = changesets(:normal_user_subscribed_change)
+
     assert_difference('changeset.subscribers.count', -1) do
-      post :unsubscribe, { :id => changeset.id, :format => :xml }
+      post :unsubscribe, { :id => changeset.id }
     end
     assert_response :success
   end
@@ -1980,6 +1985,7 @@ EOF
   ##
   # test unsubscribe fail
   def test_unsubscribe_fail
+    # unauthorized
     changeset = changesets(:normal_user_closed_change)
     assert_no_difference('changeset.subscribers.count') do
       post :unsubscribe, { :id => changeset.id }
@@ -1988,11 +1994,13 @@ EOF
 
     basic_authorization(users(:public_user).email, 'test')
 
+    # bad changeset id
     assert_no_difference('changeset.subscribers.count', -1) do
       post :unsubscribe, { :id => 999111 }
     end
     assert_response :not_found
 
+    # not closed changeset
     changeset = changesets(:normal_user_first_change)
     assert_no_difference('changeset.subscribers.count', -1) do
       post :unsubscribe, { :id => changeset.id }
@@ -2010,23 +2018,25 @@ EOF
   ##
   # test hide comment fail
   def test_hide_comment_fail
+    # unauthorized
     comment = changeset_comments(:normal_comment_1)
     assert('comment.visible') do
-      post :hide_comment, { :id => comment.id, :format => "xml" }
+      post :hide_comment, { :id => comment.id }
       assert_response :unauthorized
     end
-    
 
     basic_authorization(users(:public_user).email, 'test')
 
+    # not a moderator
     assert('comment.visible') do
-      post :hide_comment, { :id => comment.id, :format => "xml" }
+      post :hide_comment, { :id => comment.id }
       assert_response :forbidden
     end
 
     basic_authorization(users(:moderator_user).email, 'test')
 
-    post :hide_comment, { :id => 999111, :format => "xml" }
+    # bad comment id
+    post :hide_comment, { :id => 999111 }
     assert_response :not_found
   end
 
@@ -2038,7 +2048,7 @@ EOF
     basic_authorization(users(:moderator_user).email, 'test')
 
     assert('!comment.visible') do
-      post :hide_comment, { :id => comment.id, :format => "xml" }
+      post :hide_comment, { :id => comment.id }
     end
     assert_response :success
   end
@@ -2046,23 +2056,25 @@ EOF
   ##
   # test unhide comment fail
   def test_unhide_comment_fail
+    # unauthorized
     comment = changeset_comments(:normal_comment_1)
     assert('comment.visible') do
-      post :unhide_comment, { :id => comment.id, :format => "xml" }
+      post :unhide_comment, { :id => comment.id }
       assert_response :unauthorized
     end
-    
 
     basic_authorization(users(:public_user).email, 'test')
 
+    # not a moderator
     assert('comment.visible') do
-      post :unhide_comment, { :id => comment.id, :format => "xml" }
+      post :unhide_comment, { :id => comment.id }
       assert_response :forbidden
     end
 
     basic_authorization(users(:moderator_user).email, 'test')
 
-    post :unhide_comment, { :id => 999111, :format => "xml" }
+    # bad comment id
+    post :unhide_comment, { :id => 999111 }
     assert_response :not_found
   end
 
@@ -2074,7 +2086,7 @@ EOF
     basic_authorization(users(:moderator_user).email, 'test')
 
     assert('!comment.visible') do
-      post :unhide_comment, { :id => comment.id, :format => "xml" }
+      post :unhide_comment, { :id => comment.id }
     end
     assert_response :success
   end
@@ -2111,7 +2123,7 @@ EOF
   def assert_changesets(ids)
     assert_select "osm>changeset", ids.size
     ids.each do |id|
-      assert_select "osm>changeset[id=#{id}]", 1
+      assert_select "osm>changeset[id='#{id}']", 1
     end
   end
 
@@ -2124,7 +2136,7 @@ EOF
 
     # check exactly one changeset
     assert_select "osm>changeset", 1
-    assert_select "osm>changeset[id=#{changeset_id}]", 1
+    assert_select "osm>changeset[id='#{changeset_id}']", 1
 
     # check the bbox
     doc = XML::Parser.string(@response.body).parse