use a controller method to handle cancan denials

[rails.git] / test / controllers / changeset_controller_test.rb

diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb
index 9bf3a4b8ee0e9d5cbc994f87528bb866a8837f97..e8fde7c92cd73594852716c26733945f5d116b8a 100644 (file)
--- a/test/controllers/changeset_controller_test.rb
+++ b/test/controllers/changeset_controller_test.rb
@@ -98,16 +98,16 @@ class ChangesetControllerTest < ActionController::TestCase
   def test_create
     basic_authorization create(:user, :data_public => false).email, "test"
     # Create the first user's changeset
   def test_create
     basic_authorization create(:user, :data_public => false).email, "test"
     # Create the first user's changeset

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

             "</changeset></osm>"
     put :create
     assert_require_public_data
 
     basic_authorization create(:user).email, "test"
     # Create the first user's changeset
             "</changeset></osm>"
     put :create
     assert_require_public_data
 
     basic_authorization create(:user).email, "test"
     # Create the first user's changeset

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

             "</changeset></osm>"
     put :create
 
             "</changeset></osm>"
     put :create
 


@@ -327,7 +327,7 @@ class ChangesetControllerTest < ActionController::TestCase
 
     # 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 = <<EOF.strip_heredoc
+    diff = <<CHANGESET.strip_heredoc

       <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'/>


@@ -343,7 +343,7 @@ class ChangesetControllerTest < ActionController::TestCase
         </relation>
        </modify>
       </osmChange>
         </relation>
        </modify>
       </osmChange>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -357,7 +357,7 @@ EOF
 
     # 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 = <<EOF.strip_heredoc
+    diff = <<CHANGESET.strip_heredoc

       <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'/>


@@ -373,7 +373,7 @@ EOF
         </relation>
        </modify>
       </osmChange>
         </relation>
        </modify>
       </osmChange>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -387,7 +387,7 @@ EOF
 
     # 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 = <<EOF.strip_heredoc
+    diff = <<CHANGESET.strip_heredoc

       <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'/>


@@ -403,7 +403,7 @@ EOF
         </relation>
        </modify>
       </osmChange>
         </relation>
        </modify>
       </osmChange>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -429,7 +429,7 @@ EOF
     basic_authorization user.email, "test"
 
     # simple diff to create a node way and relation using placeholders
     basic_authorization user.email, "test"
 
     # simple diff to create a node way and relation using placeholders

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

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


@@ -448,7 +448,7 @@ EOF
         </relation>
        </create>
       </osmChange>
         </relation>
        </create>
       </osmChange>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -557,12 +557,12 @@ EOF
   end
 
   def test_repeated_changeset_create
   end
 
   def test_repeated_changeset_create

-    30.times do
+    3.times do

       basic_authorization create(:user).email, "test"
 
       # create a temporary changeset
       basic_authorization create(:user).email, "test"
 
       # create a temporary changeset

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

               "</changeset></osm>"
       assert_difference "Changeset.count", 1 do
         put :create
               "</changeset></osm>"
       assert_difference "Changeset.count", 1 do
         put :create


@@ -580,9 +580,8 @@ EOF
     assert_response :success, "Should be able to create a changeset: #{@response.body}"
     changeset_id = @response.body.to_i
 
     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 to cause
-    # largest bbox over-expansion possible.
-    diff = <<EOF.strip_heredoc
+    # upload some widely-spaced nodes, spiralling positive and negative
+    diff = <<CHANGESET.strip_heredoc

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


@@ -605,7 +604,7 @@ EOF
         <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>

-EOF
+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.


@@ -619,7 +618,7 @@ EOF
     assert cs.min_lon >= -180 * GeoRecord::SCALE, "Minimum longitude (#{cs.min_lon / GeoRecord::SCALE}) should be >= -180 to be valid."
     assert cs.max_lon <= 180 * GeoRecord::SCALE, "Maximum longitude (#{cs.max_lon / GeoRecord::SCALE}) should be <= 180 to be valid."
     assert cs.min_lat >= -90 * GeoRecord::SCALE, "Minimum latitude (#{cs.min_lat / GeoRecord::SCALE}) should be >= -90 to be valid."
     assert cs.min_lon >= -180 * GeoRecord::SCALE, "Minimum longitude (#{cs.min_lon / GeoRecord::SCALE}) should be >= -180 to be valid."
     assert cs.max_lon <= 180 * GeoRecord::SCALE, "Maximum longitude (#{cs.max_lon / GeoRecord::SCALE}) should be <= 180 to be valid."
     assert cs.min_lat >= -90 * GeoRecord::SCALE, "Minimum latitude (#{cs.min_lat / GeoRecord::SCALE}) should be >= -90 to be valid."

-    assert cs.max_lat >= 90 * GeoRecord::SCALE, "Maximum latitude (#{cs.max_lat / GeoRecord::SCALE}) should be <= 90 to be valid."
+    assert cs.max_lat <= 90 * GeoRecord::SCALE, "Maximum latitude (#{cs.max_lat / GeoRecord::SCALE}) should be <= 90 to be valid."

   end
 
   ##
   end
 
   ##


@@ -739,7 +738,7 @@ EOF
     basic_authorization changeset.user.email, "test"
 
     # simple diff to create a node way and relation using placeholders
     basic_authorization changeset.user.email, "test"
 
     # simple diff to create a node way and relation using placeholders

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

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


@@ -747,7 +746,7 @@ EOF
         </node>
        </create>
       </osmChange>
         </node>
        </create>
       </osmChange>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -770,7 +769,7 @@ EOF
     basic_authorization changeset.user.email, "test"
 
     # simple diff to create a node way and relation using placeholders
     basic_authorization changeset.user.email, "test"
 
     # simple diff to create a node way and relation using placeholders

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

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


@@ -790,7 +789,7 @@ EOF
         </relation>
        </modify>
       </osmChange>
         </relation>
        </modify>
       </osmChange>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -812,9 +811,7 @@ EOF
     assert_equal 2, Node.find(new_node_id).tags.size, "new node should have two tags"
     assert_equal [new_node_id, node.id], Way.find(way.id).nds, "way nodes should match"
     Relation.find(relation.id).members.each do |type, id, _role|
     assert_equal 2, Node.find(new_node_id).tags.size, "new node should have two tags"
     assert_equal [new_node_id, node.id], Way.find(way.id).nds, "way nodes should match"
     Relation.find(relation.id).members.each do |type, id, _role|

-      if type == "node"
-        assert_equal new_node_id, id, "relation should contain new node"
-      end
+      assert_equal new_node_id, id, "relation should contain new node" if type == "node"

     end
   end
 
     end
   end
 


@@ -832,7 +829,7 @@ EOF
     basic_authorization changeset.user.email, "test"
 
     # simple diff to create a node way and relation using placeholders
     basic_authorization changeset.user.email, "test"
 
     # simple diff to create a node way and relation using placeholders

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

       <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'/>


@@ -854,7 +851,7 @@ EOF
         </node>
        </create>
       </osmChange>
         </node>
        </create>
       </osmChange>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -878,7 +875,7 @@ EOF
     # 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 = <<EOF.strip_heredoc
+    diff = <<CHANGESET.strip_heredoc

       <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'/>


@@ -891,7 +888,7 @@ EOF
         <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>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -914,14 +911,14 @@ EOF
 
     basic_authorization changeset.user.email, "test"
 
 
     basic_authorization changeset.user.email, "test"
 

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

       <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>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -937,13 +934,13 @@ EOF
 
     basic_authorization changeset.user.email, "test"
 
 
     basic_authorization changeset.user.email, "test"
 

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

       <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>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -959,13 +956,13 @@ EOF
 
     basic_authorization changeset.user.email, "test"
 
 
     basic_authorization changeset.user.email, "test"
 

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

       <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>

-EOF
+CHANGESET

     content diff
     post :upload, :params => { :id => changeset.id }
     assert_response :bad_request, "Shouldn't be able to upload a diff with the action ping"
     content diff
     post :upload, :params => { :id => changeset.id }
     assert_response :bad_request, "Shouldn't be able to upload a diff with the action ping"


@@ -985,7 +982,7 @@ EOF
 
     basic_authorization changeset.user.email, "test"
 
 
     basic_authorization changeset.user.email, "test"
 

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

       <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>


@@ -997,7 +994,7 @@ EOF
          <member type='relation' role='some' ref='#{other_relation.id}'/>
         </relation>
        </modify></osmChange>
          <member type='relation' role='some' ref='#{other_relation.id}'/>
         </relation>
        </modify></osmChange>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -1021,7 +1018,7 @@ EOF
 
     basic_authorization changeset.user.email, "test"
 
 
     basic_authorization changeset.user.email, "test"
 

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

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


@@ -1035,7 +1032,7 @@ EOF
         <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>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -1056,7 +1053,7 @@ EOF
 
     basic_authorization changeset.user.email, "test"
 
 
     basic_authorization changeset.user.email, "test"
 

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

       <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'/>


@@ -1064,7 +1061,7 @@ EOF
         <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>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -1082,7 +1079,7 @@ EOF
 
     basic_authorization changeset.user.email, "test"
 
 
     basic_authorization changeset.user.email, "test"
 

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

       <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"/>


@@ -1096,7 +1093,7 @@ EOF
         </way>
        </create>
       </osmChange>
         </way>
        </create>
       </osmChange>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -1106,7 +1103,7 @@ EOF
     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_equal "Placeholder node not found for reference -4 in way -1", @response.body
 
     # the same again, but this time use an existing way

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

       <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"/>


@@ -1120,7 +1117,7 @@ EOF
         </way>
        </create>
       </osmChange>
         </way>
        </create>
       </osmChange>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -1139,7 +1136,7 @@ EOF
 
     basic_authorization changeset.user.email, "test"
 
 
     basic_authorization changeset.user.email, "test"
 

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

       <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"/>


@@ -1153,7 +1150,7 @@ EOF
         </relation>
        </create>
       </osmChange>
         </relation>
        </create>
       </osmChange>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -1163,7 +1160,7 @@ EOF
     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_equal "Placeholder Node not found for reference -4 in relation -1.", @response.body
 
     # the same again, but this time use an existing relation

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

       <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"/>


@@ -1177,7 +1174,7 @@ EOF
         </relation>
        </create>
       </osmChange>
         </relation>
        </create>
       </osmChange>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -1193,8 +1190,8 @@ EOF
   def test_upload_node_move
     basic_authorization create(:user).email, "test"
 
   def test_upload_node_move
     basic_authorization create(:user).email, "test"
 

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

             "</changeset></osm>"
     put :create
     assert_response :success
             "</changeset></osm>"
     put :create
     assert_response :success


@@ -1231,8 +1228,8 @@ EOF
   def test_upload_way_extend
     basic_authorization create(:user).email, "test"
 
   def test_upload_way_extend
     basic_authorization create(:user).email, "test"
 

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

             "</changeset></osm>"
     put :create
     assert_response :success
             "</changeset></osm>"
     put :create
     assert_response :success


@@ -1280,7 +1277,7 @@ EOF
       # upload it
       content diff
       post :upload, :params => { :id => changeset.id }
       # upload it
       content diff
       post :upload, :params => { :id => changeset.id }

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

                       "empty changeset: " + diff)
     end
   end
                       "empty changeset: " + diff)
     end
   end


@@ -1324,8 +1321,8 @@ EOF
     basic_authorization create(:user, :data_public => false).email, "test"
 
     # create a temporary changeset
     basic_authorization create(:user, :data_public => false).email, "test"
 
     # create a temporary changeset

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

             "</changeset></osm>"
     put :create
     assert_response :forbidden
             "</changeset></osm>"
     put :create
     assert_response :forbidden


@@ -1334,15 +1331,15 @@ EOF
     basic_authorization create(:user).email, "test"
 
     # create a temporary changeset
     basic_authorization create(:user).email, "test"
 
     # create a temporary changeset

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

             "</changeset></osm>"
     put :create
     assert_response :success
     changeset_id = @response.body.to_i
 
     # add a diff to it
             "</changeset></osm>"
     put :create
     assert_response :success
     changeset_id = @response.body.to_i
 
     # add a diff to it

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

       <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'/>


@@ -1355,7 +1352,7 @@ EOF
         <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>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -1380,8 +1377,8 @@ EOF
     basic_authorization create(:user).email, "test"
 
     # create a temporary changeset
     basic_authorization create(:user).email, "test"
 
     # create a temporary changeset

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

             "</changeset></osm>"
     put :create
     assert_response :success
             "</changeset></osm>"
     put :create
     assert_response :success


@@ -1442,15 +1439,15 @@ OSMFILE
     basic_authorization create(:user).email, "test"
 
     # create a temporary changeset
     basic_authorization create(:user).email, "test"
 
     # create a temporary changeset

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

             "</changeset></osm>"
     put :create
     assert_response :success
     changeset_id = @response.body.to_i
 
     # add a diff to it
             "</changeset></osm>"
     put :create
     assert_response :success
     changeset_id = @response.body.to_i
 
     # add a diff to it

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

       <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'/>


@@ -1470,7 +1467,7 @@ OSMFILE
         </way>
        </modify>
       </osmChange>
         </way>
        </modify>
       </osmChange>

-EOF
+CHANGESET

 
     # upload it
     content diff
 
     # upload it
     content diff


@@ -1570,11 +1567,10 @@ EOF
     # get the bounding box back from the changeset
     get :read, :params => { :id => changeset_id }
     assert_response :success, "Couldn't read back changeset for the third time."
     # get the bounding box back from the changeset
     get :read, :params => { :id => changeset_id }
     assert_response :success, "Couldn't read back changeset for the third time."

-    # note that the 3.1 here is because of the bbox overexpansion

     assert_select "osm>changeset[min_lon='1.0000000']", 1
     assert_select "osm>changeset[min_lon='1.0000000']", 1

-    assert_select "osm>changeset[max_lon='3.1000000']", 1
+    assert_select "osm>changeset[max_lon='3.0000000']", 1

     assert_select "osm>changeset[min_lat='1.0000000']", 1
     assert_select "osm>changeset[min_lat='1.0000000']", 1

-    assert_select "osm>changeset[max_lat='3.1000000']", 1
+    assert_select "osm>changeset[max_lat='3.0000000']", 1

   end
 
   ##
   end
 
   ##


@@ -1880,7 +1876,7 @@ EOF
 
     # check that the changeset is now closed as well
     assert(!changeset.is_open?,
 
     # check that the changeset is now closed as well
     assert(!changeset.is_open?,

-           "changeset should have been auto-closed by exceeding " +
+           "changeset should have been auto-closed by exceeding " \

            "element limit.")
   end
 
            "element limit.")
   end
 


@@ -2060,6 +2056,8 @@ EOF
   # This should display the last 20 non-empty changesets
   def test_feed
     changeset = create(:changeset, :num_changes => 1)
   # This should display the last 20 non-empty changesets
   def test_feed
     changeset = create(:changeset, :num_changes => 1)

+    create(:changeset_tag, :changeset => changeset)
+    create(:changeset_tag, :changeset => changeset, :k => "website", :v => "http://example.com/")

     closed_changeset = create(:changeset, :closed, :num_changes => 1)
     _empty_changeset = create(:changeset, :num_changes => 0)
 
     closed_changeset = create(:changeset, :closed, :num_changes => 1)
     _empty_changeset = create(:changeset, :num_changes => 0)
 


@@ -2075,6 +2073,8 @@ EOF
   # This should display the last 20 changesets closed in a specific area
   def test_feed_bbox
     changeset = create(:changeset, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE)
   # This should display the last 20 changesets closed in a specific area
   def test_feed_bbox
     changeset = create(:changeset, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE)

+    create(:changeset_tag, :changeset => changeset)
+    create(:changeset_tag, :changeset => changeset, :k => "website", :v => "http://example.com/")

     closed_changeset = create(:changeset, :closed, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE)
     _elsewhere_changeset = create(:changeset, :num_changes => 1, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)
     _empty_changeset = create(:changeset, :num_changes => 0, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)
     closed_changeset = create(:changeset, :closed, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE)
     _elsewhere_changeset = create(:changeset, :num_changes => 1, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)
     _empty_changeset = create(:changeset, :num_changes => 0, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)


@@ -2092,6 +2092,8 @@ EOF
   def test_feed_user
     user = create(:user)
     changesets = create_list(:changeset, 3, :user => user, :num_changes => 4)
   def test_feed_user
     user = create(:user)
     changesets = create_list(:changeset, 3, :user => user, :num_changes => 4)

+    create(:changeset_tag, :changeset => changesets[1])
+    create(:changeset_tag, :changeset => changesets[1], :k => "website", :v => "http://example.com/")

     _other_changeset = create(:changeset)
 
     get :feed, :params => { :format => :atom, :display_name => user.display_name }
     _other_changeset = create(:changeset)
 
     get :feed, :params => { :format => :atom, :display_name => user.display_name }


@@ -2242,6 +2244,13 @@ EOF
       post :subscribe, :params => { :id => changeset.id }
     end
     assert_response :success
       post :subscribe, :params => { :id => changeset.id }
     end
     assert_response :success

+
+    # not closed changeset
+    changeset = create(:changeset)
+    assert_difference "changeset.subscribers.count", 1 do
+      post :subscribe, :params => { :id => changeset.id }
+    end
+    assert_response :success

   end
 
   ##
   end
 
   ##


@@ -2264,13 +2273,6 @@ EOF
     end
     assert_response :not_found
 
     end
     assert_response :not_found
 

-    # not closed changeset
-    changeset = create(:changeset)
-    assert_no_difference "changeset.subscribers.count" do
-      post :subscribe, :params => { :id => changeset.id }
-    end
-    assert_response :conflict
-

     # trying to subscribe when already subscribed
     changeset = create(:changeset, :closed)
     changeset.subscribers.push(user)
     # trying to subscribe when already subscribed
     changeset = create(:changeset, :closed)
     changeset.subscribers.push(user)


@@ -2292,6 +2294,15 @@ EOF
       post :unsubscribe, :params => { :id => changeset.id }
     end
     assert_response :success
       post :unsubscribe, :params => { :id => changeset.id }
     end
     assert_response :success

+
+    # not closed changeset
+    changeset = create(:changeset)
+    changeset.subscribers.push(user)
+
+    assert_difference "changeset.subscribers.count", -1 do
+      post :unsubscribe, :params => { :id => changeset.id }
+    end
+    assert_response :success

   end
 
   ##
   end
 
   ##


@@ -2312,13 +2323,6 @@ EOF
     end
     assert_response :not_found
 
     end
     assert_response :not_found
 

-    # not closed changeset
-    changeset = create(:changeset)
-    assert_no_difference "changeset.subscribers.count" do
-      post :unsubscribe, :params => { :id => changeset.id }
-    end
-    assert_response :conflict
-

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