Refactor translation to avoid raw html tags

[rails.git] / test / controllers / api / changesets_controller_test.rb

diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb
index e8dda0ba16407f1dedc234eedd2488d848a342cc..979b5d8af9db0028ae395dd15fc9bd39b98a7ff1 100644 (file)
--- a/test/controllers/api/changesets_controller_test.rb
+++ b/test/controllers/api/changesets_controller_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 module Api
 require "test_helper"
 
 module Api

-  class ChangesetsControllerTest < ActionController::TestCase
+  class ChangesetsControllerTest < ActionDispatch::IntegrationTest

     ##
     # test all routes which lead to this controller
     def test_routes
     ##
     # test all routes which lead to this controller
     def test_routes


@@ -21,14 +21,26 @@ module Api
         { :path => "/api/0.6/changeset/1", :method => :get },
         { :controller => "api/changesets", :action => "show", :id => "1" }
       )
         { :path => "/api/0.6/changeset/1", :method => :get },
         { :controller => "api/changesets", :action => "show", :id => "1" }
       )

+      assert_routing(
+        { :path => "/api/0.6/changeset/1.json", :method => :get },
+        { :controller => "api/changesets", :action => "show", :id => "1", :format => "json" }
+      )

       assert_routing(
         { :path => "/api/0.6/changeset/1/subscribe", :method => :post },
         { :controller => "api/changesets", :action => "subscribe", :id => "1" }
       )
       assert_routing(
         { :path => "/api/0.6/changeset/1/subscribe", :method => :post },
         { :controller => "api/changesets", :action => "subscribe", :id => "1" }
       )

+      assert_routing(
+        { :path => "/api/0.6/changeset/1/subscribe.json", :method => :post },
+        { :controller => "api/changesets", :action => "subscribe", :id => "1", :format => "json" }
+      )

       assert_routing(
         { :path => "/api/0.6/changeset/1/unsubscribe", :method => :post },
         { :controller => "api/changesets", :action => "unsubscribe", :id => "1" }
       )
       assert_routing(
         { :path => "/api/0.6/changeset/1/unsubscribe", :method => :post },
         { :controller => "api/changesets", :action => "unsubscribe", :id => "1" }
       )

+      assert_routing(
+        { :path => "/api/0.6/changeset/1/unsubscribe.json", :method => :post },
+        { :controller => "api/changesets", :action => "unsubscribe", :id => "1", :format => "json" }
+      )

       assert_routing(
         { :path => "/api/0.6/changeset/1", :method => :put },
         { :controller => "api/changesets", :action => "update", :id => "1" }
       assert_routing(
         { :path => "/api/0.6/changeset/1", :method => :put },
         { :controller => "api/changesets", :action => "update", :id => "1" }


@@ -41,6 +53,10 @@ module Api
         { :path => "/api/0.6/changesets", :method => :get },
         { :controller => "api/changesets", :action => "query" }
       )
         { :path => "/api/0.6/changesets", :method => :get },
         { :controller => "api/changesets", :action => "query" }
       )

+      assert_routing(
+        { :path => "/api/0.6/changesets.json", :method => :get },
+        { :controller => "api/changesets", :action => "query", :format => "json" }
+      )

     end
 
     # -----------------------
     end
 
     # -----------------------


@@ -48,22 +64,22 @@ module Api
     # -----------------------
 
     def test_create
     # -----------------------
 
     def test_create

-      basic_authorization create(:user, :data_public => false).email, "test"
+      auth_header = basic_authorization_header create(:user, :data_public => false).email, "test"

       # Create the first user's changeset
       xml = "<osm><changeset>" \
             "<tag k='created_by' v='osm test suite checking changesets'/>" \
             "</changeset></osm>"
       # Create the first user's changeset
       xml = "<osm><changeset>" \
             "<tag k='created_by' v='osm test suite checking changesets'/>" \
             "</changeset></osm>"

-      put :create, :body => xml
+      put changeset_create_path, :params => xml, :headers => auth_header

       assert_require_public_data
 
       assert_require_public_data
 

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

       # Create the first user's changeset
       xml = "<osm><changeset>" \
             "<tag k='created_by' v='osm test suite checking changesets'/>" \
             "</changeset></osm>"
       # Create the first user's changeset
       xml = "<osm><changeset>" \
             "<tag k='created_by' v='osm test suite checking changesets'/>" \
             "</changeset></osm>"

-      put :create, :body => xml
+      put changeset_create_path, :params => xml, :headers => auth_header

 
 

-      assert_response :success, "Creation of changeset did not return sucess status"
+      assert_response :success, "Creation of changeset did not return success status"

       newid = @response.body.to_i
 
       # check end time, should be an hour ahead of creation time
       newid = @response.body.to_i
 
       # check end time, should be an hour ahead of creation time


@@ -71,7 +87,7 @@ module Api
       duration = cs.closed_at - cs.created_at
       # the difference can either be a rational, or a floating point number
       # of seconds, depending on the code path taken :-(
       duration = cs.closed_at - cs.created_at
       # the difference can either be a rational, or a floating point number
       # of seconds, depending on the code path taken :-(

-      if duration.class == Rational
+      if duration.instance_of?(Rational)

         assert_equal Rational(1, 24), duration, "initial idle timeout should be an hour (#{cs.created_at} -> #{cs.closed_at})"
       else
         # must be number of seconds...
         assert_equal Rational(1, 24), duration, "initial idle timeout should be an hour (#{cs.created_at} -> #{cs.closed_at})"
       else
         # must be number of seconds...


@@ -83,45 +99,47 @@ module Api
     end
 
     def test_create_invalid
     end
 
     def test_create_invalid

-      basic_authorization create(:user, :data_public => false).email, "test"
+      auth_header = basic_authorization_header create(:user, :data_public => false).email, "test"

       xml = "<osm><changeset></osm>"
       xml = "<osm><changeset></osm>"

-      put :create, :body => xml
+      put changeset_create_path, :params => xml, :headers => auth_header

       assert_require_public_data
 
       ## Try the public user
       assert_require_public_data
 
       ## Try the public user

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

       xml = "<osm><changeset></osm>"
       xml = "<osm><changeset></osm>"

-      put :create, :body => xml
+      put changeset_create_path, :params => xml, :headers => auth_header

       assert_response :bad_request, "creating a invalid changeset should fail"
     end
 
     def test_create_invalid_no_content
       ## First check with no auth
       assert_response :bad_request, "creating a invalid changeset should fail"
     end
 
     def test_create_invalid_no_content
       ## First check with no auth

-      put :create
+      put changeset_create_path

       assert_response :unauthorized, "shouldn't be able to create a changeset with no auth"
 
       ## Now try to with a non-public user
       assert_response :unauthorized, "shouldn't be able to create a changeset with no auth"
 
       ## Now try to with a non-public user

-      basic_authorization create(:user, :data_public => false).email, "test"
-      put :create
+      auth_header = basic_authorization_header create(:user, :data_public => false).email, "test"
+      put changeset_create_path, :headers => auth_header

       assert_require_public_data
 
       ## Try an inactive user
       assert_require_public_data
 
       ## Try an inactive user

-      basic_authorization create(:user, :pending).email, "test"
-      put :create
+      auth_header = basic_authorization_header create(:user, :pending).email, "test"
+      put changeset_create_path, :headers => auth_header

       assert_inactive_user
 
       ## Now try to use a normal user
       assert_inactive_user
 
       ## Now try to use a normal user

-      basic_authorization create(:user).email, "test"
-      put :create
+      auth_header = basic_authorization_header create(:user).email, "test"
+      put changeset_create_path, :headers => auth_header

       assert_response :bad_request, "creating a changeset with no content should fail"
     end
 
     def test_create_wrong_method
       assert_response :bad_request, "creating a changeset with no content should fail"
     end
 
     def test_create_wrong_method

-      basic_authorization create(:user).email, "test"
-      get :create
-      assert_response :method_not_allowed
-      post :create
-      assert_response :method_not_allowed
+      auth_header = basic_authorization_header create(:user).email, "test"
+      assert_raise ActionController::RoutingError do
+        get changeset_create_path, :headers => auth_header
+      end
+      assert_raise ActionController::RoutingError do
+        post changeset_create_path, :headers => auth_header
+      end

     end
 
     ##
     end
 
     ##


@@ -130,7 +148,7 @@ module Api
     def test_show
       changeset = create(:changeset)
 
     def test_show
       changeset = create(:changeset)
 

-      get :show, :params => { :id => changeset.id }
+      get changeset_show_path(changeset)

       assert_response :success, "cannot get first changeset"
 
       assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1
       assert_response :success, "cannot get first changeset"
 
       assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1


@@ -140,7 +158,7 @@ module Api
       assert_select "osm>changeset>@closed_at", 0
       assert_select "osm>changeset>discussion", 0
 
       assert_select "osm>changeset>@closed_at", 0
       assert_select "osm>changeset>discussion", 0
 

-      get :show, :params => { :id => changeset.id, :include_discussion => true }
+      get changeset_show_path(changeset), :params => { :include_discussion => true }

       assert_response :success, "cannot get first changeset with comments"
 
       assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1
       assert_response :success, "cannot get first changeset with comments"
 
       assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1


@@ -154,7 +172,7 @@ module Api
       changeset = create(:changeset, :closed)
       create_list(:changeset_comment, 3, :changeset_id => changeset.id)
 
       changeset = create(:changeset, :closed)
       create_list(:changeset_comment, 3, :changeset_id => changeset.id)
 

-      get :show, :params => { :id => changeset.id, :include_discussion => true }
+      get changeset_show_path(changeset), :params => { :include_discussion => true }

       assert_response :success, "cannot get closed changeset with comments"
 
       assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1
       assert_response :success, "cannot get closed changeset with comments"
 
       assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1


@@ -166,11 +184,104 @@ module Api
       assert_select "osm>changeset>discussion>comment", 3
     end
 
       assert_select "osm>changeset>discussion>comment", 3
     end
 

+    def test_show_json
+      changeset = create(:changeset)
+
+      get changeset_show_path(changeset), :params => { :format => "json" }
+      assert_response :success, "cannot get first changeset"
+
+      js = ActiveSupport::JSON.decode(@response.body)
+      assert_not_nil js
+
+      assert_equal Settings.api_version, js["version"]
+      assert_equal "OpenStreetMap server", js["generator"]
+      assert_equal changeset.id, js["changeset"]["id"]
+      assert js["changeset"]["open"]
+      assert_equal changeset.created_at.xmlschema, js["changeset"]["created_at"]
+      assert_nil js["changeset"]["closed_at"]
+      assert_nil js["changeset"]["tags"]
+      assert_nil js["changeset"]["comments"]
+      assert_equal changeset.user.id, js["changeset"]["uid"]
+      assert_equal changeset.user.display_name, js["changeset"]["user"]
+
+      get changeset_show_path(changeset), :params => { :format => "json", :include_discussion => true }
+      assert_response :success, "cannot get first changeset with comments"
+
+      js = ActiveSupport::JSON.decode(@response.body)
+      assert_not_nil js
+      assert_equal Settings.api_version, js["version"]
+      assert_equal "OpenStreetMap server", js["generator"]
+      assert_equal changeset.id, js["changeset"]["id"]
+      assert js["changeset"]["open"]
+      assert_equal changeset.created_at.xmlschema, js["changeset"]["created_at"]
+      assert_nil js["changeset"]["closed_at"]
+      assert_nil js["changeset"]["tags"]
+      assert_nil js["changeset"]["min_lat"]
+      assert_nil js["changeset"]["min_lon"]
+      assert_nil js["changeset"]["max_lat"]
+      assert_nil js["changeset"]["max_lon"]
+      assert_equal 0, js["changeset"]["comments"].count
+    end
+
+    def test_show_tag_and_discussion_json
+      changeset = create(:changeset, :closed)
+
+      tag1 = ChangesetTag.new
+      tag1.changeset_id = changeset.id
+      tag1.k = "created_by"
+      tag1.v = "JOSM/1.5 (18364)"
+
+      tag2 = ChangesetTag.new
+      tag2.changeset_id = changeset.id
+      tag2.k = "comment"
+      tag2.v = "changeset comment"
+
+      changeset.changeset_tags = [tag1, tag2]
+
+      create_list(:changeset_comment, 3, :changeset_id => changeset.id)
+
+      get changeset_show_path(changeset), :params => { :format => "json", :include_discussion => true }
+      assert_response :success, "cannot get closed changeset with comments"
+
+      js = ActiveSupport::JSON.decode(@response.body)
+
+      assert_not_nil js
+      assert_equal Settings.api_version, js["version"]
+      assert_equal "OpenStreetMap server", js["generator"]
+      assert_equal changeset.id, js["changeset"]["id"]
+      assert_not js["changeset"]["open"]
+      assert_equal changeset.created_at.xmlschema, js["changeset"]["created_at"]
+      assert_equal changeset.closed_at.xmlschema, js["changeset"]["closed_at"]
+      assert_equal 2, js["changeset"]["tags"].count
+      assert_equal 3, js["changeset"]["comments"].count
+      assert_equal 3, js["changeset"]["comments_count"]
+      assert_equal 0, js["changeset"]["changes_count"]
+      assert_not_nil js["changeset"]["comments"][0]["uid"]
+      assert_not_nil js["changeset"]["comments"][0]["user"]
+      assert_not_nil js["changeset"]["comments"][0]["text"]
+    end
+
+    def test_show_bbox_json
+      # test bbox attribute
+      changeset = create(:changeset, :min_lat => (-5 * GeoRecord::SCALE).round, :min_lon => (5 * GeoRecord::SCALE).round,
+                                     :max_lat => (15 * GeoRecord::SCALE).round, :max_lon => (12 * GeoRecord::SCALE).round)
+
+      get changeset_show_path(changeset), :params => { :format => "json" }
+      assert_response :success, "cannot get first changeset"
+
+      js = ActiveSupport::JSON.decode(@response.body)
+      assert_not_nil js
+      assert_equal(-5, js["changeset"]["min_lat"])
+      assert_equal  5, js["changeset"]["min_lon"]
+      assert_equal 15, js["changeset"]["max_lat"]
+      assert_equal 12, js["changeset"]["max_lon"]
+    end
+

     ##
     # check that a changeset that doesn't exist returns an appropriate message
     def test_show_not_found
       [0, -32, 233455644, "afg", "213"].each do |id|
     ##
     # check that a changeset that doesn't exist returns an appropriate message
     def test_show_not_found
       [0, -32, 233455644, "afg", "213"].each do |id|

-        get :show, :params => { :id => id }
+        get changeset_show_path(:id => id)

         assert_response :not_found, "should get a not found"
       rescue ActionController::UrlGenerationError => e
         assert_match(/No route matches/, e.to_s)
         assert_response :not_found, "should get a not found"
       rescue ActionController::UrlGenerationError => e
         assert_match(/No route matches/, e.to_s)


@@ -186,25 +297,25 @@ module Api
       changeset = create(:changeset, :user => user)
 
       ## Try without authentication
       changeset = create(:changeset, :user => user)
 
       ## Try without authentication

-      put :close, :params => { :id => changeset.id }
+      put changeset_close_path(changeset)

       assert_response :unauthorized
 
       ## Try using the non-public user
       assert_response :unauthorized
 
       ## Try using the non-public user

-      basic_authorization private_user.email, "test"
-      put :close, :params => { :id => private_changeset.id }
+      auth_header = basic_authorization_header private_user.email, "test"
+      put changeset_close_path(private_changeset), :headers => auth_header

       assert_require_public_data
 
       ## The try with the public user
       assert_require_public_data
 
       ## The try with the public user

-      basic_authorization user.email, "test"
+      auth_header = basic_authorization_header user.email, "test"

 
       cs_id = changeset.id
 
       cs_id = changeset.id

-      put :close, :params => { :id => cs_id }
+      put changeset_close_path(:id => cs_id), :headers => auth_header

       assert_response :success
 
       # test that it really is closed now
       assert_response :success
 
       # test that it really is closed now

-      cs = Changeset.find(cs_id)
-      assert_not(cs.is_open?,
-                 "changeset should be closed now (#{cs.closed_at} > #{Time.now.getutc}.")
+      cs = Changeset.find(changeset.id)
+      assert_not(cs.open?,
+                 "changeset should be closed now (#{cs.closed_at} > #{Time.now.utc}.")

     end
 
     ##
     end
 
     ##


@@ -213,9 +324,9 @@ module Api
       user = create(:user)
       changeset = create(:changeset)
 
       user = create(:user)
       changeset = create(:changeset)
 

-      basic_authorization user.email, "test"
+      auth_header = basic_authorization_header user.email, "test"

 
 

-      put :close, :params => { :id => changeset.id }
+      put changeset_close_path(changeset), :headers => auth_header

       assert_response :conflict
       assert_equal "The user doesn't own that changeset", @response.body
     end
       assert_response :conflict
       assert_equal "The user doesn't own that changeset", @response.body
     end


@@ -226,13 +337,15 @@ module Api
       user = create(:user)
       changeset = create(:changeset, :user => user)
 
       user = create(:user)
       changeset = create(:changeset, :user => user)
 

-      basic_authorization user.email, "test"
+      auth_header = basic_authorization_header user.email, "test"

 
 

-      get :close, :params => { :id => changeset.id }
-      assert_response :method_not_allowed
+      assert_raise ActionController::RoutingError do
+        get changeset_close_path(changeset), :headers => auth_header
+      end

 
 

-      post :close, :params => { :id => changeset.id }
-      assert_response :method_not_allowed
+      assert_raise ActionController::RoutingError do
+        post changeset_close_path(changeset), :headers => auth_header
+      end

     end
 
     ##
     end
 
     ##


@@ -242,16 +355,16 @@ module Api
 
       # First try to do it with no auth
       cs_ids.each do |id|
 
       # First try to do it with no auth
       cs_ids.each do |id|

-        put :close, :params => { :id => id }
+        put changeset_close_path(:id => id)

         assert_response :unauthorized, "Shouldn't be able close the non-existant changeset #{id}, when not authorized"
       rescue ActionController::UrlGenerationError => e
         assert_match(/No route matches/, e.to_s)
       end
 
       # Now try with auth
         assert_response :unauthorized, "Shouldn't be able close the non-existant changeset #{id}, when not authorized"
       rescue ActionController::UrlGenerationError => e
         assert_match(/No route matches/, e.to_s)
       end
 
       # Now try with auth

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

       cs_ids.each do |id|
       cs_ids.each do |id|

-        put :close, :params => { :id => id }
+        put changeset_close_path(:id => id), :headers => auth_header

         assert_response :not_found, "The changeset #{id} doesn't exist, so can't be closed"
       rescue ActionController::UrlGenerationError => e
         assert_match(/No route matches/, e.to_s)
         assert_response :not_found, "The changeset #{id} doesn't exist, so can't be closed"
       rescue ActionController::UrlGenerationError => e
         assert_match(/No route matches/, e.to_s)


@@ -282,7 +395,7 @@ module Api
 
       # simple diff to change a node, way and relation by removing
       # their tags
 
       # simple diff to change a node, way and relation by removing
       # their tags

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <modify>
           <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
         <osmChange>
          <modify>
           <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>


@@ -298,20 +411,20 @@ module Api
           </relation>
          </modify>
         </osmChange>
           </relation>
          </modify>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset_id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff

       assert_response :unauthorized,
                       "shouldn't be able to upload a simple valid diff to changeset: #{@response.body}"
 
       ## Now try with a private user
       assert_response :unauthorized,
                       "shouldn't be able to upload a simple valid diff to changeset: #{@response.body}"
 
       ## Now try with a private user

-      basic_authorization private_user.email, "test"
+      auth_header = basic_authorization_header private_user.email, "test"

       changeset_id = private_changeset.id
 
       # simple diff to change a node, way and relation by removing
       # their tags
       changeset_id = private_changeset.id
 
       # simple diff to change a node, way and relation by removing
       # their tags

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <modify>
           <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
         <osmChange>
          <modify>
           <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>


@@ -327,20 +440,20 @@ CHANGESET
           </relation>
          </modify>
         </osmChange>
           </relation>
          </modify>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset_id }, :body => diff
+      post changeset_upload_path(private_changeset), :params => diff, :headers => auth_header

       assert_response :forbidden,
                       "can't upload a simple valid diff to changeset: #{@response.body}"
 
       ## Now try with the public user
       assert_response :forbidden,
                       "can't upload a simple valid diff to changeset: #{@response.body}"
 
       ## Now try with the public user

-      basic_authorization user.email, "test"
+      auth_header = basic_authorization_header user.email, "test"

       changeset_id = changeset.id
 
       # simple diff to change a node, way and relation by removing
       # their tags
       changeset_id = changeset.id
 
       # simple diff to change a node, way and relation by removing
       # their tags

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <modify>
           <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
         <osmChange>
          <modify>
           <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>


@@ -356,10 +469,10 @@ CHANGESET
           </relation>
          </modify>
         </osmChange>
           </relation>
          </modify>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset_id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :success,
                       "can't upload a simple valid diff to changeset: #{@response.body}"
 
       assert_response :success,
                       "can't upload a simple valid diff to changeset: #{@response.body}"
 


@@ -378,10 +491,10 @@ CHANGESET
       way = create(:way_with_nodes, :nodes_count => 2)
       relation = create(:relation)
 
       way = create(:way_with_nodes, :nodes_count => 2)
       relation = create(:relation)
 

-      basic_authorization user.email, "test"
+      auth_header = basic_authorization_header user.email, "test"

 
       # simple diff to create a node way and relation using placeholders
 
       # simple diff to create a node way and relation using placeholders

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <create>
           <node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
         <osmChange>
          <create>
           <node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>


@@ -400,10 +513,10 @@ CHANGESET
           </relation>
          </create>
         </osmChange>
           </relation>
          </create>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :success,
                       "can't upload a simple valid creation to changeset: #{@response.body}"
 
       assert_response :success,
                       "can't upload a simple valid creation to changeset: #{@response.body}"
 


@@ -448,16 +561,16 @@ CHANGESET
       create(:relation_member, :relation => super_relation, :member => used_way)
       create(:relation_member, :relation => super_relation, :member => used_node)
 
       create(:relation_member, :relation => super_relation, :member => used_way)
       create(:relation_member, :relation => super_relation, :member => used_node)
 

-      basic_authorization changeset.user.display_name, "test"
+      auth_header = basic_authorization_header changeset.user.display_name, "test"

 
       diff = XML::Document.new
       diff.root = XML::Node.new "osmChange"
       delete = XML::Node.new "delete"
       diff.root << delete
 
       diff = XML::Document.new
       diff.root = XML::Node.new "osmChange"
       delete = XML::Node.new "delete"
       diff.root << delete

-      delete << super_relation.to_xml_node
-      delete << used_relation.to_xml_node
-      delete << used_way.to_xml_node
-      delete << used_node.to_xml_node
+      delete << xml_node_for_relation(super_relation)
+      delete << xml_node_for_relation(used_relation)
+      delete << xml_node_for_way(used_way)
+      delete << xml_node_for_node(used_node)

 
       # update the changeset to one that this user owns
       %w[node way relation].each do |type|
 
       # update the changeset to one that this user owns
       %w[node way relation].each do |type|


@@ -467,7 +580,7 @@ CHANGESET
       end
 
       # upload it
       end
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff.to_s
+      post changeset_upload_path(changeset), :params => diff.to_s, :headers => auth_header

       assert_response :success,
                       "can't upload a deletion diff to changeset: #{@response.body}"
 
       assert_response :success,
                       "can't upload a deletion diff to changeset: #{@response.body}"
 


@@ -477,10 +590,10 @@ CHANGESET
       assert_select "diffResult>relation", 2
 
       # check that everything was deleted
       assert_select "diffResult>relation", 2
 
       # check that everything was deleted

-      assert_equal false, Node.find(used_node.id).visible
-      assert_equal false, Way.find(used_way.id).visible
-      assert_equal false, Relation.find(super_relation.id).visible
-      assert_equal false, Relation.find(used_relation.id).visible
+      assert_not Node.find(used_node.id).visible
+      assert_not Way.find(used_way.id).visible
+      assert_not Relation.find(super_relation.id).visible
+      assert_not Relation.find(used_relation.id).visible

     end
 
     ##
     end
 
     ##


@@ -490,11 +603,11 @@ CHANGESET
       node = create(:node)
       changeset = create(:changeset)
 
       node = create(:node)
       changeset = create(:changeset)
 

-      basic_authorization changeset.user.display_name, "test"
+      auth_header = basic_authorization_header changeset.user.display_name, "test"

       diff = "<osmChange><delete><node id='#{node.id}' version='#{node.version}' changeset='#{changeset.id}'/></delete></osmChange>"
 
       # upload it
       diff = "<osmChange><delete><node id='#{node.id}' version='#{node.version}' changeset='#{changeset.id}'/></delete></osmChange>"
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :success,
                       "can't upload a deletion diff to changeset: #{@response.body}"
 
       assert_response :success,
                       "can't upload a deletion diff to changeset: #{@response.body}"
 


@@ -502,34 +615,34 @@ CHANGESET
       assert_select "diffResult>node", 1
 
       # check that everything was deleted
       assert_select "diffResult>node", 1
 
       # check that everything was deleted

-      assert_equal false, Node.find(node.id).visible
+      assert_not Node.find(node.id).visible

     end
 
     def test_repeated_changeset_create
       3.times do
     end
 
     def test_repeated_changeset_create
       3.times do

-        basic_authorization create(:user).email, "test"
+        auth_header = basic_authorization_header create(:user).email, "test"

 
         # create a temporary changeset
         xml = "<osm><changeset>" \
               "<tag k='created_by' v='osm test suite checking changesets'/>" \
               "</changeset></osm>"
         assert_difference "Changeset.count", 1 do
 
         # create a temporary changeset
         xml = "<osm><changeset>" \
               "<tag k='created_by' v='osm test suite checking changesets'/>" \
               "</changeset></osm>"
         assert_difference "Changeset.count", 1 do

-          put :create, :body => xml
+          put changeset_create_path, :params => xml, :headers => auth_header

         end
         assert_response :success
       end
     end
 
     def test_upload_large_changeset
         end
         assert_response :success
       end
     end
 
     def test_upload_large_changeset

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

 
       # create a changeset
 
       # create a changeset

-      put :create, :body => "<osm><changeset/></osm>"
+      put changeset_create_path, :params => "<osm><changeset/></osm>", :headers => auth_header

       assert_response :success, "Should be able to create a changeset: #{@response.body}"
       changeset_id = @response.body.to_i
 
       # upload some widely-spaced nodes, spiralling positive and negative
       assert_response :success, "Should be able to create a changeset: #{@response.body}"
       changeset_id = @response.body.to_i
 
       # upload some widely-spaced nodes, spiralling positive and negative

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <create>
           <node id='-1' lon='-20' lat='-10' changeset='#{changeset_id}'/>
         <osmChange>
          <create>
           <node id='-1' lon='-20' lat='-10' changeset='#{changeset_id}'/>


@@ -552,11 +665,11 @@ CHANGESET
           <node id='-18' lon='179.9'  lat='89.9' changeset='#{changeset_id}'/>
          </create>
         </osmChange>
           <node id='-18' lon='179.9'  lat='89.9' changeset='#{changeset_id}'/>
          </create>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it, which used to cause an error like "PGError: ERROR:
       # integer out of range" (bug #2152). but shouldn't any more.
 
       # upload it, which used to cause an error like "PGError: ERROR:
       # integer out of range" (bug #2152). but shouldn't any more.

-      post :upload, :params => { :id => changeset_id }, :body => diff
+      post changeset_upload_path(:id => changeset_id), :params => diff, :headers => auth_header

       assert_response :success,
                       "can't upload a spatially-large diff to changeset: #{@response.body}"
 
       assert_response :success,
                       "can't upload a spatially-large diff to changeset: #{@response.body}"
 


@@ -580,15 +693,15 @@ CHANGESET
       create(:relation_member, :relation => relation, :member => used_way)
       create(:relation_member, :relation => relation, :member => used_node)
 
       create(:relation_member, :relation => relation, :member => used_way)
       create(:relation_member, :relation => relation, :member => used_node)
 

-      basic_authorization changeset.user.email, "test"
+      auth_header = basic_authorization_header changeset.user.email, "test"

 
       diff = XML::Document.new
       diff.root = XML::Node.new "osmChange"
       delete = XML::Node.new "delete"
       diff.root << delete
 
       diff = XML::Document.new
       diff.root = XML::Node.new "osmChange"
       delete = XML::Node.new "delete"
       diff.root << delete

-      delete << other_relation.to_xml_node
-      delete << used_way.to_xml_node
-      delete << used_node.to_xml_node
+      delete << xml_node_for_relation(other_relation)
+      delete << xml_node_for_way(used_way)
+      delete << xml_node_for_node(used_node)

 
       # update the changeset to one that this user owns
       %w[node way relation].each do |type|
 
       # update the changeset to one that this user owns
       %w[node way relation].each do |type|


@@ -598,16 +711,16 @@ CHANGESET
       end
 
       # upload it
       end
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff.to_s
+      post changeset_upload_path(changeset), :params => diff.to_s, :headers => auth_header

       assert_response :precondition_failed,
                       "shouldn't be able to upload a invalid deletion diff: #{@response.body}"
       assert_equal "Precondition failed: Way #{used_way.id} is still used by relations #{relation.id}.", @response.body
 
       # check that nothing was, in fact, deleted
       assert_response :precondition_failed,
                       "shouldn't be able to upload a invalid deletion diff: #{@response.body}"
       assert_equal "Precondition failed: Way #{used_way.id} is still used by relations #{relation.id}.", @response.body
 
       # check that nothing was, in fact, deleted

-      assert_equal true, Node.find(used_node.id).visible
-      assert_equal true, Way.find(used_way.id).visible
-      assert_equal true, Relation.find(relation.id).visible
-      assert_equal true, Relation.find(other_relation.id).visible
+      assert Node.find(used_node.id).visible
+      assert Way.find(used_way.id).visible
+      assert Relation.find(relation.id).visible
+      assert Relation.find(other_relation.id).visible

     end
 
     ##
     end
 
     ##


@@ -622,16 +735,16 @@ CHANGESET
       create(:relation_member, :relation => super_relation, :member => used_way)
       create(:relation_member, :relation => super_relation, :member => used_node)
 
       create(:relation_member, :relation => super_relation, :member => used_way)
       create(:relation_member, :relation => super_relation, :member => used_node)
 

-      basic_authorization changeset.user.email, "test"
+      auth_header = basic_authorization_header changeset.user.email, "test"

 
       diff = XML::Document.new
       diff.root = XML::Node.new "osmChange"
       delete = XML::Node.new "delete"
       diff.root << delete
       delete["if-unused"] = ""
 
       diff = XML::Document.new
       diff.root = XML::Node.new "osmChange"
       delete = XML::Node.new "delete"
       diff.root << delete
       delete["if-unused"] = ""

-      delete << used_relation.to_xml_node
-      delete << used_way.to_xml_node
-      delete << used_node.to_xml_node
+      delete << xml_node_for_relation(used_relation)
+      delete << xml_node_for_way(used_way)
+      delete << xml_node_for_node(used_node)

 
       # update the changeset to one that this user owns
       %w[node way relation].each do |type|
 
       # update the changeset to one that this user owns
       %w[node way relation].each do |type|


@@ -641,7 +754,7 @@ CHANGESET
       end
 
       # upload it
       end
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff.to_s
+      post changeset_upload_path(changeset), :params => diff.to_s, :headers => auth_header

       assert_response :success,
                       "can't do a conditional delete of in use objects: #{@response.body}"
 
       assert_response :success,
                       "can't do a conditional delete of in use objects: #{@response.body}"
 


@@ -670,9 +783,9 @@ CHANGESET
       assert_equal used_relation.version, doc.find("//diffResult/relation").first["new_version"].to_i
 
       # check that nothing was, in fact, deleted
       assert_equal used_relation.version, doc.find("//diffResult/relation").first["new_version"].to_i
 
       # check that nothing was, in fact, deleted

-      assert_equal true, Node.find(used_node.id).visible
-      assert_equal true, Way.find(used_way.id).visible
-      assert_equal true, Relation.find(used_relation.id).visible
+      assert Node.find(used_node.id).visible
+      assert Way.find(used_way.id).visible
+      assert Relation.find(used_relation.id).visible

     end
 
     ##
     end
 
     ##


@@ -680,10 +793,10 @@ CHANGESET
     def test_upload_invalid_too_long_tag
       changeset = create(:changeset)
 
     def test_upload_invalid_too_long_tag
       changeset = create(:changeset)
 

-      basic_authorization changeset.user.email, "test"
+      auth_header = basic_authorization_header changeset.user.email, "test"

 
       # simple diff to create a node way and relation using placeholders
 
       # simple diff to create a node way and relation using placeholders

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <create>
           <node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
         <osmChange>
          <create>
           <node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>


@@ -691,12 +804,12 @@ CHANGESET
           </node>
          </create>
         </osmChange>
           </node>
          </create>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :bad_request,
       assert_response :bad_request,

-                      "shoudln't be able to upload too long a tag to changeset: #{@response.body}"
+                      "shouldn't be able to upload too long a tag to changeset: #{@response.body}"

     end
 
     ##
     end
 
     ##


@@ -710,10 +823,10 @@ CHANGESET
 
       changeset = create(:changeset)
 
 
       changeset = create(:changeset)
 

-      basic_authorization changeset.user.email, "test"
+      auth_header = basic_authorization_header changeset.user.email, "test"

 
       # simple diff to create a node way and relation using placeholders
 
       # simple diff to create a node way and relation using placeholders

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <create>
           <node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
         <osmChange>
          <create>
           <node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>


@@ -733,10 +846,10 @@ CHANGESET
           </relation>
          </modify>
         </osmChange>
           </relation>
          </modify>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :success,
                       "can't upload a complex diff to changeset: #{@response.body}"
 
       assert_response :success,
                       "can't upload a complex diff to changeset: #{@response.body}"
 


@@ -769,10 +882,10 @@ CHANGESET
       relation = create(:relation)
       other_relation = create(:relation)
 
       relation = create(:relation)
       other_relation = create(:relation)
 

-      basic_authorization changeset.user.email, "test"
+      auth_header = basic_authorization_header changeset.user.email, "test"

 
       # simple diff to create a node way and relation using placeholders
 
       # simple diff to create a node way and relation using placeholders

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <modify>
           <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
         <osmChange>
          <modify>
           <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>


@@ -794,10 +907,10 @@ CHANGESET
           </node>
          </create>
         </osmChange>
           </node>
          </create>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :conflict,
                       "uploading a diff with multiple changesets should have failed"
 
       assert_response :conflict,
                       "uploading a diff with multiple changesets should have failed"
 


@@ -812,12 +925,12 @@ CHANGESET
     def test_upload_multiple_valid
       node = create(:node)
       changeset = create(:changeset)
     def test_upload_multiple_valid
       node = create(:node)
       changeset = create(:changeset)

-      basic_authorization changeset.user.email, "test"
+      auth_header = basic_authorization_header changeset.user.email, "test"

 
       # change the location of a node multiple times, each time referencing
       # the last version. doesn't this depend on version numbers being
       # sequential?
 
       # change the location of a node multiple times, each time referencing
       # the last version. doesn't this depend on version numbers being
       # sequential?

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <modify>
           <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
         <osmChange>
          <modify>
           <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>


@@ -830,10 +943,10 @@ CHANGESET
           <node id='#{node.id}' lon='9' lat='9' changeset='#{changeset.id}' version='8'/>
          </modify>
         </osmChange>
           <node id='#{node.id}' lon='9' lat='9' changeset='#{changeset.id}' version='8'/>
          </modify>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :success,
                       "can't upload multiple versions of an element in a diff: #{@response.body}"
 
       assert_response :success,
                       "can't upload multiple versions of an element in a diff: #{@response.body}"
 


@@ -850,19 +963,19 @@ CHANGESET
       node = create(:node)
       changeset = create(:changeset)
 
       node = create(:node)
       changeset = create(:changeset)
 

-      basic_authorization changeset.user.email, "test"
+      auth_header = basic_authorization_header changeset.user.email, "test"

 
 

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <modify>
           <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
           <node id='#{node.id}' lon='1' lat='1' changeset='#{changeset.id}' version='1'/>
          </modify>
         </osmChange>
         <osmChange>
          <modify>
           <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
           <node id='#{node.id}' lon='1' lat='1' changeset='#{changeset.id}' version='1'/>
          </modify>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :conflict,
                       "shouldn't be able to upload the same element twice in a diff: #{@response.body}"
     end
       assert_response :conflict,
                       "shouldn't be able to upload the same element twice in a diff: #{@response.body}"
     end


@@ -872,18 +985,18 @@ CHANGESET
     def test_upload_missing_version
       changeset = create(:changeset)
 
     def test_upload_missing_version
       changeset = create(:changeset)
 

-      basic_authorization changeset.user.email, "test"
+      auth_header = basic_authorization_header changeset.user.email, "test"

 
 

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <modify>
          <node id='1' lon='1' lat='1' changeset='#{changeset.id}'/>
          </modify>
         </osmChange>
         <osmChange>
          <modify>
          <node id='1' lon='1' lat='1' changeset='#{changeset.id}'/>
          </modify>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :bad_request,
                       "shouldn't be able to upload an element without version: #{@response.body}"
     end
       assert_response :bad_request,
                       "shouldn't be able to upload an element without version: #{@response.body}"
     end


@@ -893,18 +1006,18 @@ CHANGESET
     def test_action_upload_invalid
       changeset = create(:changeset)
 
     def test_action_upload_invalid
       changeset = create(:changeset)
 

-      basic_authorization changeset.user.email, "test"
+      auth_header = basic_authorization_header changeset.user.email, "test"

 
 

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
           <ping>
            <node id='1' lon='1' lat='1' changeset='#{changeset.id}' />
           </ping>
         </osmChange>
         <osmChange>
           <ping>
            <node id='1' lon='1' lat='1' changeset='#{changeset.id}' />
           </ping>
         </osmChange>

-CHANGESET
-      post :upload, :params => { :id => changeset.id }, :body => diff
+      CHANGESET
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :bad_request, "Shouldn't be able to upload a diff with the action ping"
       assert_response :bad_request, "Shouldn't be able to upload a diff with the action ping"

-      assert_equal @response.body, "Unknown action ping, choices are create, modify, delete"
+      assert_equal("Unknown action ping, choices are create, modify, delete", @response.body)

     end
 
     ##
     end
 
     ##


@@ -918,9 +1031,9 @@ CHANGESET
       other_relation = create(:relation)
       create(:relation_tag, :relation => relation)
 
       other_relation = create(:relation)
       create(:relation_tag, :relation => relation)
 

-      basic_authorization changeset.user.email, "test"
+      auth_header = basic_authorization_header changeset.user.email, "test"

 
 

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <modify><node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}'
           version='1'></node>
         <osmChange>
          <modify><node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}'
           version='1'></node>


@@ -932,10 +1045,10 @@ CHANGESET
            <member type='relation' role='some' ref='#{other_relation.id}'/>
           </relation>
          </modify></osmChange>
            <member type='relation' role='some' ref='#{other_relation.id}'/>
           </relation>
          </modify></osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :success,
                       "can't upload a valid diff with whitespace variations to changeset: #{@response.body}"
 
       assert_response :success,
                       "can't upload a valid diff with whitespace variations to changeset: #{@response.body}"
 


@@ -953,9 +1066,9 @@ CHANGESET
     def test_upload_reuse_placeholder_valid
       changeset = create(:changeset)
 
     def test_upload_reuse_placeholder_valid
       changeset = create(:changeset)
 

-      basic_authorization changeset.user.email, "test"
+      auth_header = basic_authorization_header changeset.user.email, "test"

 
 

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <create>
           <node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
         <osmChange>
          <create>
           <node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>


@@ -969,10 +1082,10 @@ CHANGESET
           <node id='-1' lon='2' lat='2' changeset='#{changeset.id}' version='2'/>
          </delete>
         </osmChange>
           <node id='-1' lon='2' lat='2' changeset='#{changeset.id}' version='2'/>
          </delete>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :success,
                       "can't upload a valid diff with re-used placeholders to changeset: #{@response.body}"
 
       assert_response :success,
                       "can't upload a valid diff with re-used placeholders to changeset: #{@response.body}"
 


@@ -987,9 +1100,9 @@ CHANGESET
     def test_upload_placeholder_invalid
       changeset = create(:changeset)
 
     def test_upload_placeholder_invalid
       changeset = create(:changeset)
 

-      basic_authorization changeset.user.email, "test"
+      auth_header = basic_authorization_header changeset.user.email, "test"

 
 

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <create>
           <node id='-1' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
         <osmChange>
          <create>
           <node id='-1' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>


@@ -997,14 +1110,98 @@ CHANGESET
           <node id='-1' lon='2' lat='2' changeset='#{changeset.id}' version='2'/>
          </create>
         </osmChange>
           <node id='-1' lon='2' lat='2' changeset='#{changeset.id}' version='2'/>
          </create>
         </osmChange>

-CHANGESET
+      CHANGESET
+
+      # upload it
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header
+      assert_response :bad_request,
+                      "shouldn't be able to re-use placeholder IDs"
+
+      # placeholder_ids must be unique across all action blocks
+      diff = <<~CHANGESET
+        <osmChange>
+         <create>
+          <node id='-1' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
+         </create>
+         <create>
+          <node id='-1' lon='1' lat='1' changeset='#{changeset.id}' version='1'/>
+         </create>
+        </osmChange>
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :bad_request,
                       "shouldn't be able to re-use placeholder IDs"
     end
 
       assert_response :bad_request,
                       "shouldn't be able to re-use placeholder IDs"
     end
 

+    def test_upload_process_order
+      changeset = create(:changeset)
+
+      auth_header = basic_authorization_header changeset.user.email, "test"
+
+      diff = <<~CHANGESET
+        <osmChange>
+        <create>
+          <node id="-1" lat="1" lon="2" changeset="#{changeset.id}"/>
+          <way id="-1" changeset="#{changeset.id}">
+              <nd ref="-1"/>
+              <nd ref="-2"/>
+          </way>
+          <node id="-2" lat="1" lon="2" changeset="#{changeset.id}"/>
+        </create>
+        </osmChange>
+      CHANGESET
+
+      # upload it
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header
+      assert_response :bad_request,
+                      "shouldn't refer elements behind it"
+    end
+
+    def test_upload_duplicate_delete
+      changeset = create(:changeset)
+
+      auth_header = basic_authorization_header changeset.user.email, "test"
+
+      diff = <<~CHANGESET
+        <osmChange>
+          <create>
+            <node id="-1" lat="39" lon="116" changeset="#{changeset.id}" />
+          </create>
+          <delete>
+            <node id="-1" version="1" changeset="#{changeset.id}" />
+            <node id="-1" version="1" changeset="#{changeset.id}" />
+          </delete>
+        </osmChange>
+      CHANGESET
+
+      # upload it
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header
+      assert_response :gone,
+                      "transaction should be cancelled by second deletion"
+
+      diff = <<~CHANGESET
+        <osmChange>
+          <create>
+            <node id="-1" lat="39" lon="116" changeset="#{changeset.id}" />
+          </create>
+          <delete if-unused="true">
+            <node id="-1" version="1" changeset="#{changeset.id}" />
+            <node id="-1" version="1" changeset="#{changeset.id}" />
+          </delete>
+        </osmChange>
+      CHANGESET
+
+      # upload it
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header
+
+      assert_select "diffResult>node", 3
+      assert_select "diffResult>node[old_id='-1']", 3
+      assert_select "diffResult>node[new_version='1']", 1
+      assert_select "diffResult>node[new_version='2']", 1
+    end
+

     ##
     # test that uploading a way referencing invalid placeholders gives a
     # proper error, not a 500.
     ##
     # test that uploading a way referencing invalid placeholders gives a
     # proper error, not a 500.


@@ -1012,9 +1209,9 @@ CHANGESET
       changeset = create(:changeset)
       way = create(:way)
 
       changeset = create(:changeset)
       way = create(:way)
 

-      basic_authorization changeset.user.email, "test"
+      auth_header = basic_authorization_header changeset.user.email, "test"

 
 

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <create>
           <node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
         <osmChange>
          <create>
           <node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>


@@ -1028,16 +1225,16 @@ CHANGESET
           </way>
          </create>
         </osmChange>
           </way>
          </create>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :bad_request,
                       "shouldn't be able to use invalid placeholder IDs"
       assert_equal "Placeholder node not found for reference -4 in way -1", @response.body
 
       # the same again, but this time use an existing way
       assert_response :bad_request,
                       "shouldn't be able to use invalid placeholder IDs"
       assert_equal "Placeholder node not found for reference -4 in way -1", @response.body
 
       # the same again, but this time use an existing way

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <create>
           <node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
         <osmChange>
          <create>
           <node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>


@@ -1051,10 +1248,10 @@ CHANGESET
           </way>
          </create>
         </osmChange>
           </way>
          </create>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :bad_request,
                       "shouldn't be able to use invalid placeholder IDs"
       assert_equal "Placeholder node not found for reference -4 in way #{way.id}", @response.body
       assert_response :bad_request,
                       "shouldn't be able to use invalid placeholder IDs"
       assert_equal "Placeholder node not found for reference -4 in way #{way.id}", @response.body


@@ -1067,9 +1264,9 @@ CHANGESET
       changeset = create(:changeset)
       relation = create(:relation)
 
       changeset = create(:changeset)
       relation = create(:relation)
 

-      basic_authorization changeset.user.email, "test"
+      auth_header = basic_authorization_header changeset.user.email, "test"

 
 

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <create>
           <node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
         <osmChange>
          <create>
           <node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>


@@ -1083,16 +1280,16 @@ CHANGESET
           </relation>
          </create>
         </osmChange>
           </relation>
          </create>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :bad_request,
                       "shouldn't be able to use invalid placeholder IDs"
       assert_equal "Placeholder Node not found for reference -4 in relation -1.", @response.body
 
       # the same again, but this time use an existing relation
       assert_response :bad_request,
                       "shouldn't be able to use invalid placeholder IDs"
       assert_equal "Placeholder Node not found for reference -4 in relation -1.", @response.body
 
       # the same again, but this time use an existing relation

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <create>
           <node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>
         <osmChange>
          <create>
           <node id="-1" lon="0" lat="0" changeset="#{changeset.id}" version="1"/>


@@ -1106,10 +1303,10 @@ CHANGESET
           </relation>
          </create>
         </osmChange>
           </relation>
          </create>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset.id }, :body => diff
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header

       assert_response :bad_request,
                       "shouldn't be able to use invalid placeholder IDs"
       assert_equal "Placeholder Way not found for reference -1 in relation #{relation.id}.", @response.body
       assert_response :bad_request,
                       "shouldn't be able to use invalid placeholder IDs"
       assert_equal "Placeholder Way not found for reference -1 in relation #{relation.id}.", @response.body


@@ -1119,12 +1316,12 @@ CHANGESET
     # test what happens if a diff is uploaded containing only a node
     # move.
     def test_upload_node_move
     # test what happens if a diff is uploaded containing only a node
     # move.
     def test_upload_node_move

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

 
       xml = "<osm><changeset>" \
             "<tag k='created_by' v='osm test suite checking changesets'/>" \
             "</changeset></osm>"
 
       xml = "<osm><changeset>" \
             "<tag k='created_by' v='osm test suite checking changesets'/>" \
             "</changeset></osm>"

-      put :create, :body => xml
+      put changeset_create_path, :params => xml, :headers => auth_header

       assert_response :success
       changeset_id = @response.body.to_i
 
       assert_response :success
       changeset_id = @response.body.to_i
 


@@ -1133,7 +1330,7 @@ CHANGESET
       diff = XML::Document.new
       diff.root = XML::Node.new "osmChange"
       modify = XML::Node.new "modify"
       diff = XML::Document.new
       diff.root = XML::Node.new "osmChange"
       modify = XML::Node.new "modify"

-      xml_old_node = old_node.to_xml_node
+      xml_old_node = xml_node_for_node(old_node)

       xml_old_node["lat"] = 2.0.to_s
       xml_old_node["lon"] = 2.0.to_s
       xml_old_node["changeset"] = changeset_id.to_s
       xml_old_node["lat"] = 2.0.to_s
       xml_old_node["lon"] = 2.0.to_s
       xml_old_node["changeset"] = changeset_id.to_s


@@ -1141,7 +1338,7 @@ CHANGESET
       diff.root << modify
 
       # upload it
       diff.root << modify
 
       # upload it

-      post :upload, :params => { :id => changeset_id }, :body => diff.to_s
+      post changeset_upload_path(:id => changeset_id), :params => diff.to_s, :headers => auth_header

       assert_response :success,
                       "diff should have uploaded OK"
 
       assert_response :success,
                       "diff should have uploaded OK"
 


@@ -1156,12 +1353,12 @@ CHANGESET
     ##
     # test what happens if a diff is uploaded adding a node to a way.
     def test_upload_way_extend
     ##
     # test what happens if a diff is uploaded adding a node to a way.
     def test_upload_way_extend

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

 
       xml = "<osm><changeset>" \
             "<tag k='created_by' v='osm test suite checking changesets'/>" \
             "</changeset></osm>"
 
       xml = "<osm><changeset>" \
             "<tag k='created_by' v='osm test suite checking changesets'/>" \
             "</changeset></osm>"

-      put :create, :body => xml
+      put changeset_create_path, :params => xml, :headers => auth_header

       assert_response :success
       changeset_id = @response.body.to_i
 
       assert_response :success
       changeset_id = @response.body.to_i
 


@@ -1171,7 +1368,7 @@ CHANGESET
       diff = XML::Document.new
       diff.root = XML::Node.new "osmChange"
       modify = XML::Node.new "modify"
       diff = XML::Document.new
       diff.root = XML::Node.new "osmChange"
       modify = XML::Node.new "modify"

-      xml_old_way = old_way.to_xml_node
+      xml_old_way = xml_node_for_way(old_way)

       nd_ref = XML::Node.new "nd"
       nd_ref["ref"] = create(:node, :lat => 3, :lon => 3).id.to_s
       xml_old_way << nd_ref
       nd_ref = XML::Node.new "nd"
       nd_ref["ref"] = create(:node, :lat => 3, :lon => 3).id.to_s
       xml_old_way << nd_ref


@@ -1180,7 +1377,7 @@ CHANGESET
       diff.root << modify
 
       # upload it
       diff.root << modify
 
       # upload it

-      post :upload, :params => { :id => changeset_id }, :body => diff.to_s
+      post changeset_upload_path(:id => changeset_id), :params => diff.to_s, :headers => auth_header

       assert_response :success,
                       "diff should have uploaded OK"
 
       assert_response :success,
                       "diff should have uploaded OK"
 


@@ -1197,16 +1394,16 @@ CHANGESET
     def test_upload_empty_invalid
       changeset = create(:changeset)
 
     def test_upload_empty_invalid
       changeset = create(:changeset)
 

-      basic_authorization changeset.user.email, "test"
+      auth_header = basic_authorization_header changeset.user.email, "test"

 
       ["<osmChange/>",
        "<osmChange></osmChange>",
        "<osmChange><modify/></osmChange>",
        "<osmChange><modify></modify></osmChange>"].each do |diff|
         # upload it
 
       ["<osmChange/>",
        "<osmChange></osmChange>",
        "<osmChange><modify/></osmChange>",
        "<osmChange><modify></modify></osmChange>"].each do |diff|
         # upload it

-        post :upload, :params => { :id => changeset.id }, :body => diff
+        post changeset_upload_path(changeset), :params => diff, :headers => auth_header

         assert_response(:success, "should be able to upload " \
         assert_response(:success, "should be able to upload " \

-                        "empty changeset: " + diff)
+                                  "empty changeset: " + diff)

       end
     end
 
       end
     end
 


@@ -1217,18 +1414,18 @@ CHANGESET
       node = create(:node)
       create(:relation_member, :member => node)
 
       node = create(:node)
       create(:relation_member, :member => node)
 

-      basic_authorization changeset.user.email, "test"
+      auth_header = basic_authorization_header changeset.user.email, "test"

 
       # try and delete a node that is in use
       diff = XML::Document.new
       diff.root = XML::Node.new "osmChange"
       delete = XML::Node.new "delete"
       diff.root << delete
 
       # try and delete a node that is in use
       diff = XML::Document.new
       diff.root = XML::Node.new "osmChange"
       delete = XML::Node.new "delete"
       diff.root << delete

-      delete << node.to_xml_node
+      delete << xml_node_for_node(node)

 
       # upload it
 
       # upload it

-      error_format "xml"
-      post :upload, :params => { :id => changeset.id }, :body => diff.to_s
+      error_header = error_format_header "xml"
+      post changeset_upload_path(changeset), :params => diff.to_s, :headers => auth_header.merge(error_header)

       assert_response :success,
                       "failed to return error in XML format"
 
       assert_response :success,
                       "failed to return error in XML format"
 


@@ -1238,6 +1435,153 @@ CHANGESET
       assert_select "osmError>message", 1
     end
 
       assert_select "osmError>message", 1
     end
 

+    def test_upload_not_found
+      changeset = create(:changeset)
+
+      auth_header = basic_authorization_header changeset.user.email, "test"
+
+      # modify node
+      diff = <<~CHANGESET
+        <osmChange>
+        <modify>
+          <node id='-1' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
+        </modify>
+        </osmChange>
+      CHANGESET
+
+      # upload it
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header
+      assert_response :not_found, "Node should not be found"
+
+      # modify way
+      diff = <<~CHANGESET
+        <osmChange>
+        <modify>
+          <way id='-1' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
+        </modify>
+        </osmChange>
+      CHANGESET
+
+      # upload it
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header
+      assert_response :not_found, "Way should not be found"
+
+      # modify relation
+      diff = <<~CHANGESET
+        <osmChange>
+        <modify>
+          <relation id='-1' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
+        </modify>
+        </osmChange>
+      CHANGESET
+
+      # upload it
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header
+      assert_response :not_found, "Relation should not be found"
+
+      # delete node
+      diff = <<~CHANGESET
+        <osmChange>
+        <delete>
+          <node id='-1' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
+        </delete>
+        </osmChange>
+      CHANGESET
+
+      # upload it
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header
+      assert_response :not_found, "Node should not be deleted"
+
+      # delete way
+      diff = <<~CHANGESET
+        <osmChange>
+        <delete>
+          <way id='-1' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
+        </delete>
+        </osmChange>
+      CHANGESET
+
+      # upload it
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header
+      assert_response :not_found, "Way should not be deleted"
+
+      # delete relation
+      diff = <<~CHANGESET
+        <osmChange>
+        <delete>
+          <relation id='-1' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
+        </delete>
+        </osmChange>
+      CHANGESET
+
+      # upload it
+      post changeset_upload_path(changeset), :params => diff, :headers => auth_header
+      assert_response :not_found, "Relation should not be deleted"
+    end
+
+    def test_upload_relation_placeholder_not_fix
+      changeset = create(:changeset)
+
+      auth_header = basic_authorization_header changeset.user.email, "test"
+
+      # modify node
+      diff = <<~CHANGESET
+        <osmChange version='0.6'>
+          <create>
+            <relation id='-2' version='0' changeset='#{changeset.id}'>
+              <member type='relation' role='' ref='-4' />
+              <tag k='type' v='route' />
+              <tag k='name' v='AtoB' />
+            </relation>
+            <relation id='-3' version='0' changeset='#{changeset.id}'>
+              <tag k='type' v='route' />
+              <tag k='name' v='BtoA' />
+            </relation>
+            <relation id='-4' version='0' changeset='#{changeset.id}'>
+              <member type='relation' role='' ref='-2' />
+              <member type='relation' role='' ref='-3' />
+              <tag k='type' v='route_master' />
+              <tag k='name' v='master' />
+            </relation>
+          </create>
+        </osmChange>
+      CHANGESET
+
+      # upload it
+      post changeset_upload_path(changeset), :params => diff.to_s, :headers => auth_header
+      assert_response :bad_request, "shouldn't be able to use reference -4 in relation -2: #{@response.body}"
+      assert_equal "Placeholder Relation not found for reference -4 in relation -2.", @response.body
+    end
+
+    def test_upload_multiple_delete_block
+      changeset = create(:changeset)
+
+      auth_header = basic_authorization_header changeset.user.email, "test"
+
+      node = create(:node)
+      way = create(:way)
+      create(:way_node, :way => way, :node => node)
+      alone_node = create(:node)
+
+      # modify node
+      diff = <<~CHANGESET
+        <osmChange version='0.6'>
+          <delete version="0.6">
+            <node id="#{node.id}" version="#{node.version}" changeset="#{changeset.id}"/>
+          </delete>
+          <delete version="0.6" if-unused="true">
+            <node id="#{alone_node.id}" version="#{alone_node.version}" changeset="#{changeset.id}"/>
+          </delete>
+        </osmChange>
+      CHANGESET
+
+      # upload it
+      post changeset_upload_path(changeset), :params => diff.to_s, :headers => auth_header
+      assert_response :precondition_failed,
+                      "shouldn't be able to upload a invalid deletion diff: #{@response.body}"
+      assert_equal "Precondition failed: Node #{node.id} is still used by ways #{way.id}.", @response.body
+    end
+

     ##
     # when we make some simple changes we get the same changes back from the
     # diff download.
     ##
     # when we make some simple changes we get the same changes back from the
     # diff download.


@@ -1245,28 +1589,28 @@ CHANGESET
       node = create(:node)
 
       ## First try with a non-public user, which should get a forbidden
       node = create(:node)
 
       ## First try with a non-public user, which should get a forbidden

-      basic_authorization create(:user, :data_public => false).email, "test"
+      auth_header = basic_authorization_header create(:user, :data_public => false).email, "test"

 
       # create a temporary changeset
       xml = "<osm><changeset>" \
             "<tag k='created_by' v='osm test suite checking changesets'/>" \
             "</changeset></osm>"
 
       # create a temporary changeset
       xml = "<osm><changeset>" \
             "<tag k='created_by' v='osm test suite checking changesets'/>" \
             "</changeset></osm>"

-      put :create, :body => xml
+      put changeset_create_path, :params => xml, :headers => auth_header

       assert_response :forbidden
 
       ## Now try with a normal user
       assert_response :forbidden
 
       ## Now try with a normal user

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

 
       # create a temporary changeset
       xml = "<osm><changeset>" \
             "<tag k='created_by' v='osm test suite checking changesets'/>" \
             "</changeset></osm>"
 
       # create a temporary changeset
       xml = "<osm><changeset>" \
             "<tag k='created_by' v='osm test suite checking changesets'/>" \
             "</changeset></osm>"

-      put :create, :body => xml
+      put changeset_create_path, :params => xml, :headers => auth_header

       assert_response :success
       changeset_id = @response.body.to_i
 
       # add a diff to it
       assert_response :success
       changeset_id = @response.body.to_i
 
       # add a diff to it

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <modify>
           <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
         <osmChange>
          <modify>
           <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>


@@ -1279,14 +1623,14 @@ CHANGESET
           <node id='#{node.id}' lon='9' lat='9' changeset='#{changeset_id}' version='8'/>
          </modify>
         </osmChange>
           <node id='#{node.id}' lon='9' lat='9' changeset='#{changeset_id}' version='8'/>
          </modify>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset_id }, :body => diff
+      post changeset_upload_path(:id => changeset_id), :params => diff, :headers => auth_header

       assert_response :success,
                       "can't upload multiple versions of an element in a diff: #{@response.body}"
 
       assert_response :success,
                       "can't upload multiple versions of an element in a diff: #{@response.body}"
 

-      get :download, :params => { :id => changeset_id }
+      get changeset_download_path(:id => changeset_id)

       assert_response :success
 
       assert_select "osmChange", 1
       assert_response :success
 
       assert_select "osmChange", 1


@@ -1300,17 +1644,17 @@ CHANGESET
     #
     # NOTE: the error turned out to be something else completely!
     def test_josm_upload
     #
     # NOTE: the error turned out to be something else completely!
     def test_josm_upload

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

 
       # create a temporary changeset
       xml = "<osm><changeset>" \
             "<tag k='created_by' v='osm test suite checking changesets'/>" \
             "</changeset></osm>"
 
       # create a temporary changeset
       xml = "<osm><changeset>" \
             "<tag k='created_by' v='osm test suite checking changesets'/>" \
             "</changeset></osm>"

-      put :create, :body => xml
+      put changeset_create_path, :params => xml, :headers => auth_header

       assert_response :success
       changeset_id = @response.body.to_i
 
       assert_response :success
       changeset_id = @response.body.to_i
 

-      diff = <<OSMFILE.strip_heredoc
+      diff = <<~OSMFILE

         <osmChange version="0.6" generator="JOSM">
         <create version="0.6" generator="JOSM">
           <node id='-1' visible='true' changeset='#{changeset_id}' lat='51.49619982187321' lon='-0.18722061869438314' />
         <osmChange version="0.6" generator="JOSM">
         <create version="0.6" generator="JOSM">
           <node id='-1' visible='true' changeset='#{changeset_id}' lat='51.49619982187321' lon='-0.18722061869438314' />


@@ -1322,7 +1666,7 @@ CHANGESET
           <node id='-7' visible='true' changeset='#{changeset_id}' lat='51.49560784152179' lon='-0.18694719410005425' />
           <node id='-8' visible='true' changeset='#{changeset_id}' lat='51.49567389979617' lon='-0.1860289771788006' />
           <node id='-9' visible='true' changeset='#{changeset_id}' lat='51.49543761398892' lon='-0.186820684213126' />
           <node id='-7' visible='true' changeset='#{changeset_id}' lat='51.49560784152179' lon='-0.18694719410005425' />
           <node id='-8' visible='true' changeset='#{changeset_id}' lat='51.49567389979617' lon='-0.1860289771788006' />
           <node id='-9' visible='true' changeset='#{changeset_id}' lat='51.49543761398892' lon='-0.186820684213126' />

-          <way id='-10' action='modiy' visible='true' changeset='#{changeset_id}'>
+          <way id='-10' action='modify' visible='true' changeset='#{changeset_id}'>

             <nd ref='-1' />
             <nd ref='-2' />
             <nd ref='-3' />
             <nd ref='-1' />
             <nd ref='-2' />
             <nd ref='-3' />


@@ -1337,14 +1681,14 @@ CHANGESET
           </way>
         </create>
         </osmChange>
           </way>
         </create>
         </osmChange>

-OSMFILE
+      OSMFILE

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset_id }, :body => diff
+      post changeset_upload_path(:id => changeset_id), :params => diff, :headers => auth_header

       assert_response :success,
                       "can't upload a diff from JOSM: #{@response.body}"
 
       assert_response :success,
                       "can't upload a diff from JOSM: #{@response.body}"
 

-      get :download, :params => { :id => changeset_id }
+      get changeset_download_path(:id => changeset_id)

       assert_response :success
 
       assert_select "osmChange", 1
       assert_response :success
 
       assert_select "osmChange", 1


@@ -1361,18 +1705,18 @@ OSMFILE
       node = create(:node)
       node2 = create(:node)
       way = create(:way)
       node = create(:node)
       node2 = create(:node)
       way = create(:way)

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

 
       # create a temporary changeset
       xml = "<osm><changeset>" \
             "<tag k='created_by' v='osm test suite checking changesets'/>" \
             "</changeset></osm>"
 
       # create a temporary changeset
       xml = "<osm><changeset>" \
             "<tag k='created_by' v='osm test suite checking changesets'/>" \
             "</changeset></osm>"

-      put :create, :body => xml
+      put changeset_create_path, :params => xml, :headers => auth_header

       assert_response :success
       changeset_id = @response.body.to_i
 
       # add a diff to it
       assert_response :success
       changeset_id = @response.body.to_i
 
       # add a diff to it

-      diff = <<CHANGESET.strip_heredoc
+      diff = <<~CHANGESET

         <osmChange>
          <delete>
           <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
         <osmChange>
          <delete>
           <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>


@@ -1392,14 +1736,14 @@ OSMFILE
           </way>
          </modify>
         </osmChange>
           </way>
          </modify>
         </osmChange>

-CHANGESET
+      CHANGESET

 
       # upload it
 
       # upload it

-      post :upload, :params => { :id => changeset_id }, :body => diff
+      post changeset_upload_path(:id => changeset_id), :params => diff, :headers => auth_header

       assert_response :success,
                       "can't upload multiple versions of an element in a diff: #{@response.body}"
 
       assert_response :success,
                       "can't upload multiple versions of an element in a diff: #{@response.body}"
 

-      get :download, :params => { :id => changeset_id }
+      get changeset_download_path(:id => changeset_id)

       assert_response :success
 
       assert_select "osmChange", 1
       assert_response :success
 
       assert_select "osmChange", 1


@@ -1421,11 +1765,10 @@ CHANGESET
       _relation = create(:relation, :with_history, :version => 1, :changeset => changeset)
       _relation2 = create(:relation, :with_history, :deleted, :version => 1, :changeset => changeset)
 
       _relation = create(:relation, :with_history, :version => 1, :changeset => changeset)
       _relation2 = create(:relation, :with_history, :deleted, :version => 1, :changeset => changeset)
 

-      get :download, :params => { :id => changeset.id }
+      get changeset_download_path(changeset)

 
       assert_response :success
 
       assert_response :success

-      assert_template nil
-      # print @response.body
+

       # FIXME: needs more assert_select tests
       assert_select "osmChange[version='#{Settings.api_version}'][generator='#{Settings.generator}']" do
         assert_select "create", :count => 5
       # FIXME: needs more assert_select tests
       assert_select "osmChange[version='#{Settings.api_version}'][generator='#{Settings.generator}']" do
         assert_select "create", :count => 5


@@ -1443,23 +1786,23 @@ CHANGESET
       way = create(:way)
       create(:way_node, :way => way, :node => create(:node, :lat => 3, :lon => 3))
 
       way = create(:way)
       create(:way_node, :way => way, :node => create(:node, :lat => 3, :lon => 3))
 

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

 
       # create a new changeset
       xml = "<osm><changeset/></osm>"
 
       # create a new changeset
       xml = "<osm><changeset/></osm>"

-      put :create, :body => xml
+      put changeset_create_path, :params => xml, :headers => auth_header

       assert_response :success, "Creating of changeset failed."
       changeset_id = @response.body.to_i
 
       # add a single node to it
       with_controller(NodesController.new) do
         xml = "<osm><node lon='1' lat='2' changeset='#{changeset_id}'/></osm>"
       assert_response :success, "Creating of changeset failed."
       changeset_id = @response.body.to_i
 
       # add a single node to it
       with_controller(NodesController.new) do
         xml = "<osm><node lon='1' lat='2' changeset='#{changeset_id}'/></osm>"

-        put :create, :body => xml
+        put node_create_path, :params => xml, :headers => auth_header

         assert_response :success, "Couldn't create node."
       end
 
       # get the bounding box back from the changeset
         assert_response :success, "Couldn't create node."
       end
 
       # get the bounding box back from the changeset

-      get :show, :params => { :id => changeset_id }
+      get changeset_show_path(:id => changeset_id)

       assert_response :success, "Couldn't read back changeset."
       assert_select "osm>changeset[min_lon='1.0000000']", 1
       assert_select "osm>changeset[max_lon='1.0000000']", 1
       assert_response :success, "Couldn't read back changeset."
       assert_select "osm>changeset[min_lon='1.0000000']", 1
       assert_select "osm>changeset[max_lon='1.0000000']", 1


@@ -1469,12 +1812,12 @@ CHANGESET
       # add another node to it
       with_controller(NodesController.new) do
         xml = "<osm><node lon='2' lat='1' changeset='#{changeset_id}'/></osm>"
       # add another node to it
       with_controller(NodesController.new) do
         xml = "<osm><node lon='2' lat='1' changeset='#{changeset_id}'/></osm>"

-        put :create, :body => xml
+        put node_create_path, :params => xml, :headers => auth_header

         assert_response :success, "Couldn't create second node."
       end
 
       # get the bounding box back from the changeset
         assert_response :success, "Couldn't create second node."
       end
 
       # get the bounding box back from the changeset

-      get :show, :params => { :id => changeset_id }
+      get changeset_show_path(:id => changeset_id)

       assert_response :success, "Couldn't read back changeset for the second time."
       assert_select "osm>changeset[min_lon='1.0000000']", 1
       assert_select "osm>changeset[max_lon='2.0000000']", 1
       assert_response :success, "Couldn't read back changeset for the second time."
       assert_select "osm>changeset[min_lon='1.0000000']", 1
       assert_select "osm>changeset[max_lon='2.0000000']", 1


@@ -1483,13 +1826,13 @@ CHANGESET
 
       # add (delete) a way to it, which contains a point at (3,3)
       with_controller(WaysController.new) do
 
       # add (delete) a way to it, which contains a point at (3,3)
       with_controller(WaysController.new) do

-        xml = update_changeset(way.to_xml, changeset_id)
-        put :delete, :params => { :id => way.id }, :body => xml.to_s
+        xml = update_changeset(xml_for_way(way), changeset_id)
+        delete api_way_path(way), :params => xml.to_s, :headers => auth_header

         assert_response :success, "Couldn't delete a way."
       end
 
       # get the bounding box back from the changeset
         assert_response :success, "Couldn't delete a way."
       end
 
       # get the bounding box back from the changeset

-      get :show, :params => { :id => changeset_id }
+      get changeset_show_path(:id => changeset_id)

       assert_response :success, "Couldn't read back changeset for the third time."
       assert_select "osm>changeset[min_lon='1.0000000']", 1
       assert_select "osm>changeset[max_lon='3.0000000']", 1
       assert_response :success, "Couldn't read back changeset for the third time."
       assert_select "osm>changeset[min_lon='1.0000000']", 1
       assert_select "osm>changeset[max_lon='3.0000000']", 1


@@ -1509,78 +1852,89 @@ CHANGESET
       changeset2 = create(:changeset, :min_lat => (5 * GeoRecord::SCALE).round, :min_lon => (5 * GeoRecord::SCALE).round, :max_lat => (15 * GeoRecord::SCALE).round, :max_lon => (15 * GeoRecord::SCALE).round)
       changeset3 = create(:changeset, :min_lat => (4.5 * GeoRecord::SCALE).round, :min_lon => (4.5 * GeoRecord::SCALE).round, :max_lat => (5 * GeoRecord::SCALE).round, :max_lon => (5 * GeoRecord::SCALE).round)
 
       changeset2 = create(:changeset, :min_lat => (5 * GeoRecord::SCALE).round, :min_lon => (5 * GeoRecord::SCALE).round, :max_lat => (15 * GeoRecord::SCALE).round, :max_lon => (15 * GeoRecord::SCALE).round)
       changeset3 = create(:changeset, :min_lat => (4.5 * GeoRecord::SCALE).round, :min_lon => (4.5 * GeoRecord::SCALE).round, :max_lat => (5 * GeoRecord::SCALE).round, :max_lon => (5 * GeoRecord::SCALE).round)
 

-      get :query, :params => { :bbox => "-10,-10, 10, 10" }
+      get changesets_path(:bbox => "-10,-10, 10, 10")

       assert_response :success, "can't get changesets in bbox"
       assert_changesets [changeset2, changeset3]
 
       assert_response :success, "can't get changesets in bbox"
       assert_changesets [changeset2, changeset3]
 

-      get :query, :params => { :bbox => "4.5,4.5,4.6,4.6" }
+      get changesets_path(:bbox => "4.5,4.5,4.6,4.6")

       assert_response :success, "can't get changesets in bbox"
       assert_changesets [changeset3]
 
       # not found when looking for changesets of non-existing users
       assert_response :success, "can't get changesets in bbox"
       assert_changesets [changeset3]
 
       # not found when looking for changesets of non-existing users

-      get :query, :params => { :user => User.maximum(:id) + 1 }
+      get changesets_path(:user => User.maximum(:id) + 1)

       assert_response :not_found
       assert_response :not_found

-      get :query, :params => { :display_name => " " }
+      get changesets_path(:display_name => " ")

       assert_response :not_found
 
       # can't get changesets of user 1 without authenticating
       assert_response :not_found
 
       # can't get changesets of user 1 without authenticating

-      get :query, :params => { :user => private_user.id }
+      get changesets_path(:user => private_user.id)

       assert_response :not_found, "shouldn't be able to get changesets by non-public user (ID)"
       assert_response :not_found, "shouldn't be able to get changesets by non-public user (ID)"

-      get :query, :params => { :display_name => private_user.display_name }
+      get changesets_path(:display_name => private_user.display_name)

       assert_response :not_found, "shouldn't be able to get changesets by non-public user (name)"
 
       # but this should work
       assert_response :not_found, "shouldn't be able to get changesets by non-public user (name)"
 
       # but this should work

-      basic_authorization private_user.email, "test"
-      get :query, :params => { :user => private_user.id }
+      auth_header = basic_authorization_header private_user.email, "test"
+      get changesets_path(:user => private_user.id), :headers => auth_header

       assert_response :success, "can't get changesets by user ID"
       assert_changesets [private_user_changeset, private_user_closed_changeset]
 
       assert_response :success, "can't get changesets by user ID"
       assert_changesets [private_user_changeset, private_user_closed_changeset]
 

-      get :query, :params => { :display_name => private_user.display_name }
+      get changesets_path(:display_name => private_user.display_name), :headers => auth_header

       assert_response :success, "can't get changesets by user name"
       assert_changesets [private_user_changeset, private_user_closed_changeset]
 
       assert_response :success, "can't get changesets by user name"
       assert_changesets [private_user_changeset, private_user_closed_changeset]
 

+      # test json endpoint
+      get changesets_path(:display_name => private_user.display_name), :headers => auth_header, :params => { :format => "json" }
+      assert_response :success, "can't get changesets by user name"
+
+      js = ActiveSupport::JSON.decode(@response.body)
+      assert_not_nil js
+
+      assert_equal Settings.api_version, js["version"]
+      assert_equal "OpenStreetMap server", js["generator"]
+      assert_equal 2, js["changesets"].count
+

       # check that the correct error is given when we provide both UID and name
       # check that the correct error is given when we provide both UID and name

-      get :query, :params => { :user => private_user.id,
-                               :display_name => private_user.display_name }
+      get changesets_path(:user => private_user.id,
+                          :display_name => private_user.display_name), :headers => auth_header

       assert_response :bad_request, "should be a bad request to have both ID and name specified"
 
       assert_response :bad_request, "should be a bad request to have both ID and name specified"
 

-      get :query, :params => { :user => private_user.id, :open => true }
+      get changesets_path(:user => private_user.id, :open => true), :headers => auth_header

       assert_response :success, "can't get changesets by user and open"
       assert_changesets [private_user_changeset]
 
       assert_response :success, "can't get changesets by user and open"
       assert_changesets [private_user_changeset]
 

-      get :query, :params => { :time => "2007-12-31" }
+      get changesets_path(:time => "2007-12-31"), :headers => auth_header

       assert_response :success, "can't get changesets by time-since"
       assert_changesets [private_user_changeset, private_user_closed_changeset, changeset, closed_changeset, changeset2, changeset3]
 
       assert_response :success, "can't get changesets by time-since"
       assert_changesets [private_user_changeset, private_user_closed_changeset, changeset, closed_changeset, changeset2, changeset3]
 

-      get :query, :params => { :time => "2008-01-01T12:34Z" }
+      get changesets_path(:time => "2008-01-01T12:34Z"), :headers => auth_header

       assert_response :success, "can't get changesets by time-since with hour"
       assert_changesets [private_user_changeset, private_user_closed_changeset, changeset, closed_changeset, changeset2, changeset3]
 
       assert_response :success, "can't get changesets by time-since with hour"
       assert_changesets [private_user_changeset, private_user_closed_changeset, changeset, closed_changeset, changeset2, changeset3]
 

-      get :query, :params => { :time => "2007-12-31T23:59Z,2008-01-02T00:01Z" }
+      get changesets_path(:time => "2007-12-31T23:59Z,2008-01-02T00:01Z"), :headers => auth_header

       assert_response :success, "can't get changesets by time-range"
       assert_changesets [closed_changeset]
 
       assert_response :success, "can't get changesets by time-range"
       assert_changesets [closed_changeset]
 

-      get :query, :params => { :open => "true" }
+      get changesets_path(:open => "true"), :headers => auth_header

       assert_response :success, "can't get changesets by open-ness"
       assert_changesets [private_user_changeset, changeset, changeset2, changeset3]
 
       assert_response :success, "can't get changesets by open-ness"
       assert_changesets [private_user_changeset, changeset, changeset2, changeset3]
 

-      get :query, :params => { :closed => "true" }
+      get changesets_path(:closed => "true"), :headers => auth_header

       assert_response :success, "can't get changesets by closed-ness"
       assert_changesets [private_user_closed_changeset, closed_changeset]
 
       assert_response :success, "can't get changesets by closed-ness"
       assert_changesets [private_user_closed_changeset, closed_changeset]
 

-      get :query, :params => { :closed => "true", :user => private_user.id }
+      get changesets_path(:closed => "true", :user => private_user.id), :headers => auth_header

       assert_response :success, "can't get changesets by closed-ness and user"
       assert_changesets [private_user_closed_changeset]
 
       assert_response :success, "can't get changesets by closed-ness and user"
       assert_changesets [private_user_closed_changeset]
 

-      get :query, :params => { :closed => "true", :user => user.id }
+      get changesets_path(:closed => "true", :user => user.id), :headers => auth_header

       assert_response :success, "can't get changesets by closed-ness and user"
       assert_changesets [closed_changeset]
 
       assert_response :success, "can't get changesets by closed-ness and user"
       assert_changesets [closed_changeset]
 

-      get :query, :params => { :changesets => "#{private_user_changeset.id},#{changeset.id},#{closed_changeset.id}" }
+      get changesets_path(:changesets => "#{private_user_changeset.id},#{changeset.id},#{closed_changeset.id}"), :headers => auth_header

       assert_response :success, "can't get changesets by id (as comma-separated string)"
       assert_changesets [private_user_changeset, changeset, closed_changeset]
 
       assert_response :success, "can't get changesets by id (as comma-separated string)"
       assert_changesets [private_user_changeset, changeset, closed_changeset]
 

-      get :query, :params => { :changesets => "" }
+      get changesets_path(:changesets => ""), :headers => auth_header

       assert_response :bad_request, "should be a bad request since changesets is empty"
     end
 
       assert_response :bad_request, "should be a bad request since changesets is empty"
     end
 


@@ -1591,7 +1945,7 @@ CHANGESET
       ["abracadabra!",
        "1,2,3,F",
        ";drop table users;"].each do |bbox|
       ["abracadabra!",
        "1,2,3,F",
        ";drop table users;"].each do |bbox|

-        get :query, :params => { :bbox => bbox }
+        get changesets_path(:bbox => bbox)

         assert_response :bad_request, "'#{bbox}' isn't a bbox"
       end
 
         assert_response :bad_request, "'#{bbox}' isn't a bbox"
       end
 


@@ -1600,7 +1954,7 @@ CHANGESET
        ";drop table users;",
        ",",
        "-,-"].each do |time|
        ";drop table users;",
        ",",
        "-,-"].each do |time|

-        get :query, :params => { :time => time }
+        get changesets_path(:time => time)

         assert_response :bad_request, "'#{time}' isn't a valid time range"
       end
 
         assert_response :bad_request, "'#{time}' isn't a valid time range"
       end
 


@@ -1608,7 +1962,7 @@ CHANGESET
        "foobar",
        "-1",
        "0"].each do |uid|
        "foobar",
        "-1",
        "0"].each do |uid|

-        get :query, :params => { :user => uid }
+        get changesets_path(:user => uid)

         assert_response :bad_request, "'#{uid}' isn't a valid user ID"
       end
     end
         assert_response :bad_request, "'#{uid}' isn't a valid user ID"
       end
     end


@@ -1629,17 +1983,17 @@ CHANGESET
       new_changeset.find("//osm/changeset").first << new_tag
 
       # try without any authorization
       new_changeset.find("//osm/changeset").first << new_tag
 
       # try without any authorization

-      put :update, :params => { :id => private_changeset.id }, :body => new_changeset.to_s
+      put changeset_show_path(private_changeset), :params => new_changeset.to_s

       assert_response :unauthorized
 
       # try with the wrong authorization
       assert_response :unauthorized
 
       # try with the wrong authorization

-      basic_authorization create(:user).email, "test"
-      put :update, :params => { :id => private_changeset.id }, :body => new_changeset.to_s
+      auth_header = basic_authorization_header create(:user).email, "test"
+      put changeset_show_path(private_changeset), :params => new_changeset.to_s, :headers => auth_header

       assert_response :conflict
 
       # now this should get an unauthorized
       assert_response :conflict
 
       # now this should get an unauthorized

-      basic_authorization private_user.email, "test"
-      put :update, :params => { :id => private_changeset.id }, :body => new_changeset.to_s
+      auth_header = basic_authorization_header private_user.email, "test"
+      put changeset_show_path(private_changeset), :params => new_changeset.to_s, :headers => auth_header

       assert_require_public_data "user with their data non-public, shouldn't be able to edit their changeset"
 
       ## Now try with the public user
       assert_require_public_data "user with their data non-public, shouldn't be able to edit their changeset"
 
       ## Now try with the public user


@@ -1650,18 +2004,17 @@ CHANGESET
       new_changeset.find("//osm/changeset").first << new_tag
 
       # try without any authorization
       new_changeset.find("//osm/changeset").first << new_tag
 
       # try without any authorization

-      @request.env["HTTP_AUTHORIZATION"] = nil
-      put :update, :params => { :id => changeset.id }, :body => new_changeset.to_s
+      put changeset_show_path(changeset), :params => new_changeset.to_s

       assert_response :unauthorized
 
       # try with the wrong authorization
       assert_response :unauthorized
 
       # try with the wrong authorization

-      basic_authorization create(:user).email, "test"
-      put :update, :params => { :id => changeset.id }, :body => new_changeset.to_s
+      auth_header = basic_authorization_header create(:user).email, "test"
+      put changeset_show_path(changeset), :params => new_changeset.to_s, :headers => auth_header

       assert_response :conflict
 
       # now this should work...
       assert_response :conflict
 
       # now this should work...

-      basic_authorization user.email, "test"
-      put :update, :params => { :id => changeset.id }, :body => new_changeset.to_s
+      auth_header = basic_authorization_header user.email, "test"
+      put changeset_show_path(changeset), :params => new_changeset.to_s, :headers => auth_header

       assert_response :success
 
       assert_select "osm>changeset[id='#{changeset.id}']", 1
       assert_response :success
 
       assert_select "osm>changeset[id='#{changeset.id}']", 1


@@ -1673,7 +2026,7 @@ CHANGESET
     # check that a user different from the one who opened the changeset
     # can't modify it.
     def test_changeset_update_invalid
     # check that a user different from the one who opened the changeset
     # can't modify it.
     def test_changeset_update_invalid

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

 
       changeset = create(:changeset)
       new_changeset = create_changeset_xml(:user => changeset.user, :id => changeset.id)
 
       changeset = create(:changeset)
       new_changeset = create_changeset_xml(:user => changeset.user, :id => changeset.id)


@@ -1682,7 +2035,7 @@ CHANGESET
       new_tag["v"] = "testing"
       new_changeset.find("//osm/changeset").first << new_tag
 
       new_tag["v"] = "testing"
       new_changeset.find("//osm/changeset").first << new_tag
 

-      put :update, :params => { :id => changeset.id }, :body => new_changeset.to_s
+      put changeset_show_path(changeset), :params => new_changeset.to_s, :headers => auth_header

       assert_response :conflict
     end
 
       assert_response :conflict
     end
 


@@ -1690,11 +2043,11 @@ CHANGESET
     # check that a changeset can contain a certain max number of changes.
     ## FIXME should be changed to an integration test due to the with_controller
     def test_changeset_limits
     # check that a changeset can contain a certain max number of changes.
     ## FIXME should be changed to an integration test due to the with_controller
     def test_changeset_limits

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

 
       # open a new changeset
       xml = "<osm><changeset/></osm>"
 
       # open a new changeset
       xml = "<osm><changeset/></osm>"

-      put :create, :body => xml
+      put changeset_create_path, :params => xml, :headers => auth_header

       assert_response :success, "can't create a new changeset"
       cs_id = @response.body.to_i
 
       assert_response :success, "can't create a new changeset"
       cs_id = @response.body.to_i
 


@@ -1709,11 +2062,11 @@ CHANGESET
       with_controller(NodesController.new) do
         # create a new node
         xml = "<osm><node changeset='#{cs_id}' lat='0.0' lon='0.0'/></osm>"
       with_controller(NodesController.new) do
         # create a new node
         xml = "<osm><node changeset='#{cs_id}' lat='0.0' lon='0.0'/></osm>"

-        put :create, :body => xml
+        put node_create_path, :params => xml, :headers => auth_header

         assert_response :success, "can't create a new node"
         node_id = @response.body.to_i
 
         assert_response :success, "can't create a new node"
         node_id = @response.body.to_i
 

-        get :show, :params => { :id => node_id }
+        get api_node_path(:id => node_id)

         assert_response :success, "can't read back new node"
         node_doc = XML::Parser.string(@response.body).parse
         node_xml = node_doc.find("//osm/node").first
         assert_response :success, "can't read back new node"
         node_doc = XML::Parser.string(@response.body).parse
         node_xml = node_doc.find("//osm/node").first


@@ -1724,7 +2077,7 @@ CHANGESET
           node_xml["lon"] = rand.to_s
           node_xml["version"] = (i + 1).to_s
 
           node_xml["lon"] = rand.to_s
           node_xml["version"] = (i + 1).to_s
 

-          put :update, :params => { :id => node_id }, :body => node_doc.to_s
+          put api_node_path(:id => node_id), :params => node_doc.to_s, :headers => auth_header

           assert_response :success, "attempt #{i} should have succeeded"
         end
 
           assert_response :success, "attempt #{i} should have succeeded"
         end
 


@@ -1733,7 +2086,7 @@ CHANGESET
         node_xml["lon"] = rand.to_s
         node_xml["version"] = offset.to_s
 
         node_xml["lon"] = rand.to_s
         node_xml["version"] = offset.to_s
 

-        put :update, :params => { :id => node_id }, :body => node_doc.to_s
+        put api_node_path(:id => node_id), :params => node_doc.to_s, :headers => auth_header

         assert_response :conflict, "final attempt should have failed"
       end
 
         assert_response :conflict, "final attempt should have failed"
       end
 


@@ -1741,7 +2094,7 @@ CHANGESET
       assert_equal Changeset::MAX_ELEMENTS + 1, changeset.num_changes
 
       # check that the changeset is now closed as well
       assert_equal Changeset::MAX_ELEMENTS + 1, changeset.num_changes
 
       # check that the changeset is now closed as well

-      assert_not(changeset.is_open?,
+      assert_not(changeset.open?,

                  "changeset should have been auto-closed by exceeding " \
                  "element limit.")
     end
                  "changeset should have been auto-closed by exceeding " \
                  "element limit.")
     end


@@ -1755,7 +2108,7 @@ CHANGESET
       node_v1 = node.old_nodes.find_by(:version => 1)
       node_v1.redact!(create(:redaction))
 
       node_v1 = node.old_nodes.find_by(:version => 1)
       node_v1.redact!(create(:redaction))
 

-      get :download, :params => { :id => changeset.id }
+      get changeset_download_path(changeset)

       assert_response :success
 
       assert_select "osmChange", 1
       assert_response :success
 
       assert_select "osmChange", 1


@@ -1768,18 +2121,18 @@ CHANGESET
     ##
     # test subscribe success
     def test_subscribe_success
     ##
     # test subscribe success
     def test_subscribe_success

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

       changeset = create(:changeset, :closed)
 
       assert_difference "changeset.subscribers.count", 1 do
       changeset = create(:changeset, :closed)
 
       assert_difference "changeset.subscribers.count", 1 do

-        post :subscribe, :params => { :id => changeset.id }
+        post changeset_subscribe_path(changeset), :headers => auth_header

       end
       assert_response :success
 
       # not closed changeset
       changeset = create(:changeset)
       assert_difference "changeset.subscribers.count", 1 do
       end
       assert_response :success
 
       # not closed changeset
       changeset = create(:changeset)
       assert_difference "changeset.subscribers.count", 1 do

-        post :subscribe, :params => { :id => changeset.id }
+        post changeset_subscribe_path(changeset), :headers => auth_header

       end
       assert_response :success
     end
       end
       assert_response :success
     end


@@ -1792,15 +2145,15 @@ CHANGESET
       # unauthorized
       changeset = create(:changeset, :closed)
       assert_no_difference "changeset.subscribers.count" do
       # unauthorized
       changeset = create(:changeset, :closed)
       assert_no_difference "changeset.subscribers.count" do

-        post :subscribe, :params => { :id => changeset.id }
+        post changeset_subscribe_path(changeset)

       end
       assert_response :unauthorized
 
       end
       assert_response :unauthorized
 

-      basic_authorization user.email, "test"
+      auth_header = basic_authorization_header user.email, "test"

 
       # bad changeset id
       assert_no_difference "changeset.subscribers.count" do
 
       # bad changeset id
       assert_no_difference "changeset.subscribers.count" do

-        post :subscribe, :params => { :id => 999111 }
+        post changeset_subscribe_path(:id => 999111), :headers => auth_header

       end
       assert_response :not_found
 
       end
       assert_response :not_found
 


@@ -1808,7 +2161,7 @@ CHANGESET
       changeset = create(:changeset, :closed)
       changeset.subscribers.push(user)
       assert_no_difference "changeset.subscribers.count" do
       changeset = create(:changeset, :closed)
       changeset.subscribers.push(user)
       assert_no_difference "changeset.subscribers.count" do

-        post :subscribe, :params => { :id => changeset.id }
+        post changeset_subscribe_path(changeset), :headers => auth_header

       end
       assert_response :conflict
     end
       end
       assert_response :conflict
     end


@@ -1817,12 +2170,12 @@ CHANGESET
     # test unsubscribe success
     def test_unsubscribe_success
       user = create(:user)
     # test unsubscribe success
     def test_unsubscribe_success
       user = create(:user)

-      basic_authorization user.email, "test"
+      auth_header = basic_authorization_header user.email, "test"

       changeset = create(:changeset, :closed)
       changeset.subscribers.push(user)
 
       assert_difference "changeset.subscribers.count", -1 do
       changeset = create(:changeset, :closed)
       changeset.subscribers.push(user)
 
       assert_difference "changeset.subscribers.count", -1 do

-        post :unsubscribe, :params => { :id => changeset.id }
+        post changeset_unsubscribe_path(changeset), :headers => auth_header

       end
       assert_response :success
 
       end
       assert_response :success
 


@@ -1831,7 +2184,7 @@ CHANGESET
       changeset.subscribers.push(user)
 
       assert_difference "changeset.subscribers.count", -1 do
       changeset.subscribers.push(user)
 
       assert_difference "changeset.subscribers.count", -1 do

-        post :unsubscribe, :params => { :id => changeset.id }
+        post changeset_unsubscribe_path(changeset), :headers => auth_header

       end
       assert_response :success
     end
       end
       assert_response :success
     end


@@ -1842,22 +2195,22 @@ CHANGESET
       # unauthorized
       changeset = create(:changeset, :closed)
       assert_no_difference "changeset.subscribers.count" do
       # unauthorized
       changeset = create(:changeset, :closed)
       assert_no_difference "changeset.subscribers.count" do

-        post :unsubscribe, :params => { :id => changeset.id }
+        post changeset_unsubscribe_path(changeset)

       end
       assert_response :unauthorized
 
       end
       assert_response :unauthorized
 

-      basic_authorization create(:user).email, "test"
+      auth_header = basic_authorization_header create(:user).email, "test"

 
       # bad changeset id
       assert_no_difference "changeset.subscribers.count" do
 
       # bad changeset id
       assert_no_difference "changeset.subscribers.count" do

-        post :unsubscribe, :params => { :id => 999111 }
+        post changeset_unsubscribe_path(:id => 999111), :headers => auth_header

       end
       assert_response :not_found
 
       # trying to unsubscribe when not subscribed
       changeset = create(:changeset, :closed)
       assert_no_difference "changeset.subscribers.count" do
       end
       assert_response :not_found
 
       # trying to unsubscribe when not subscribed
       changeset = create(:changeset, :closed)
       assert_no_difference "changeset.subscribers.count" do

-        post :unsubscribe, :params => { :id => changeset.id }
+        post changeset_unsubscribe_path(changeset), :headers => auth_header

       end
       assert_response :not_found
     end
       end
       assert_response :not_found
     end