Fix most auto-correctable rubocop issues

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

diff --git a/test/controllers/way_controller_test.rb b/test/controllers/way_controller_test.rb
index 58984923c65f58a330e71952f111b470d9b3727c..3ae7aa36eb2d196af9c58c817813183edcdb6a14 100644 (file)
--- a/test/controllers/way_controller_test.rb
+++ b/test/controllers/way_controller_test.rb
@@ -126,7 +126,7 @@ class WayControllerTest < ActionController::TestCase
     put :create
     # hope for success
     assert_response :forbidden,
     put :create
     # hope for success
     assert_response :forbidden,

-        "way upload did not return success status"
+                    "way upload did not return success status"

     # read id of created way and search for it
     wayid = @response.body
 
     # read id of created way and search for it
     wayid = @response.body
 


@@ -145,25 +145,25 @@ class WayControllerTest < ActionController::TestCase
     put :create
     # hope for success
     assert_response :success,
     put :create
     # hope for success
     assert_response :success,

-        "way upload did not return success status"
+                    "way upload did not return success status"

     # read id of created way and search for it
     wayid = @response.body
     checkway = Way.find(wayid)
     assert_not_nil checkway,
     # read id of created way and search for it
     wayid = @response.body
     checkway = Way.find(wayid)
     assert_not_nil checkway,

-        "uploaded way not found in data base after upload"
+                   "uploaded way not found in data base after upload"

     # compare values
     assert_equal checkway.nds.length, 2,
     # compare values
     assert_equal checkway.nds.length, 2,

-        "saved way does not contain exactly one node"
+                 "saved way does not contain exactly one node"

     assert_equal checkway.nds[0], nid1,
     assert_equal checkway.nds[0], nid1,

-        "saved way does not contain the right node on pos 0"
+                 "saved way does not contain the right node on pos 0"

     assert_equal checkway.nds[1], nid2,
     assert_equal checkway.nds[1], nid2,

-        "saved way does not contain the right node on pos 1"
+                 "saved way does not contain the right node on pos 1"

     assert_equal checkway.changeset_id, changeset_id,
     assert_equal checkway.changeset_id, changeset_id,

-        "saved way does not belong to the correct changeset"
+                 "saved way does not belong to the correct changeset"

     assert_equal users(:public_user).id, checkway.changeset.user_id,
     assert_equal users(:public_user).id, checkway.changeset.user_id,

-        "saved way does not belong to user that created it"
+                 "saved way does not belong to user that created it"

     assert_equal true, checkway.visible,
     assert_equal true, checkway.visible,

-        "saved way is not visible"
+                 "saved way is not visible"

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


@@ -185,7 +185,7 @@ class WayControllerTest < ActionController::TestCase
     put :create
     # expect failure
     assert_response :forbidden,
     put :create
     # expect failure
     assert_response :forbidden,

-    "way upload with invalid node using a private user did not return 'forbidden'"
+                    "way upload with invalid node using a private user did not return 'forbidden'"

 
     # create a way with no nodes
     content "<osm><way changeset='#{open_changeset_id}'>" +
 
     # create a way with no nodes
     content "<osm><way changeset='#{open_changeset_id}'>" +


@@ -193,7 +193,7 @@ class WayControllerTest < ActionController::TestCase
     put :create
     # expect failure
     assert_response :forbidden,
     put :create
     # expect failure
     assert_response :forbidden,

-    "way upload with no node using a private userdid not return 'forbidden'"
+                    "way upload with no node using a private userdid not return 'forbidden'"

 
     # create a way inside a closed changeset
     content "<osm><way changeset='#{closed_changeset_id}'>" +
 
     # create a way inside a closed changeset
     content "<osm><way changeset='#{closed_changeset_id}'>" +


@@ -201,8 +201,7 @@ class WayControllerTest < ActionController::TestCase
     put :create
     # expect failure
     assert_response :forbidden,
     put :create
     # expect failure
     assert_response :forbidden,

-    "way upload to closed changeset with a private user did not return 'forbidden'"
-
+                    "way upload to closed changeset with a private user did not return 'forbidden'"

 
     ## Now test with a public user
     basic_authorization users(:public_user).email, "test"
 
     ## Now test with a public user
     basic_authorization users(:public_user).email, "test"


@@ -218,7 +217,7 @@ class WayControllerTest < ActionController::TestCase
     put :create
     # expect failure
     assert_response :precondition_failed,
     put :create
     # expect failure
     assert_response :precondition_failed,

-        "way upload with invalid node did not return 'precondition failed'"
+                    "way upload with invalid node did not return 'precondition failed'"

     assert_equal "Precondition failed: Way  requires the nodes with id in (0), which either do not exist, or are not visible.", @response.body
 
     # create a way with no nodes
     assert_equal "Precondition failed: Way  requires the nodes with id in (0), which either do not exist, or are not visible.", @response.body
 
     # create a way with no nodes


@@ -227,7 +226,7 @@ class WayControllerTest < ActionController::TestCase
     put :create
     # expect failure
     assert_response :precondition_failed,
     put :create
     # expect failure
     assert_response :precondition_failed,

-        "way upload with no node did not return 'precondition failed'"
+                    "way upload with no node did not return 'precondition failed'"

     assert_equal "Precondition failed: Cannot create way: data is invalid.", @response.body
 
     # create a way inside a closed changeset
     assert_equal "Precondition failed: Cannot create way: data is invalid.", @response.body
 
     # create a way inside a closed changeset


@@ -236,17 +235,17 @@ class WayControllerTest < ActionController::TestCase
     put :create
     # expect failure
     assert_response :conflict,
     put :create
     # expect failure
     assert_response :conflict,

-        "way upload to closed changeset did not return 'conflict'"
+                    "way upload to closed changeset did not return 'conflict'"

 
     # create a way with a tag which is too long
     content "<osm><way changeset='#{open_changeset_id}'>" +
       "<nd ref='#{nid1}'/>" +
 
     # create a way with a tag which is too long
     content "<osm><way changeset='#{open_changeset_id}'>" +
       "<nd ref='#{nid1}'/>" +

-      "<tag k='foo' v='#{'x'*256}'/>" +
+      "<tag k='foo' v='#{'x' * 256}'/>" +

       "</way></osm>"
     put :create
     # expect failure
     assert_response :bad_request,
       "</way></osm>"
     put :create
     # expect failure
     assert_response :bad_request,

-        "way upload to with too long tag did not return 'bad_request'"
+                    "way upload to with too long tag did not return 'bad_request'"

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


@@ -259,7 +258,7 @@ class WayControllerTest < ActionController::TestCase
     assert_response :unauthorized
 
     # now set auth using the private user
     assert_response :unauthorized
 
     # now set auth using the private user

-    basic_authorization(users(:normal_user).email, "test");
+    basic_authorization(users(:normal_user).email, "test")

 
     # this shouldn't work as with the 0.6 api we need pay load to delete
     delete :delete, :id => current_ways(:visible_way).id
 
     # this shouldn't work as with the 0.6 api we need pay load to delete
     delete :delete, :id => current_ways(:visible_way).id


@@ -277,7 +276,7 @@ class WayControllerTest < ActionController::TestCase
     assert_response :forbidden
 
     # try to delete with an invalid (non-existent) changeset
     assert_response :forbidden
 
     # try to delete with an invalid (non-existent) changeset

-    content update_changeset(current_ways(:visible_way).to_xml,0)
+    content update_changeset(current_ways(:visible_way).to_xml, 0)

     delete :delete, :id => current_ways(:visible_way).id
     assert_response :forbidden
 
     delete :delete, :id => current_ways(:visible_way).id
     assert_response :forbidden
 


@@ -289,7 +288,7 @@ class WayControllerTest < ActionController::TestCase
     # check the returned value - should be the new version number
     # valid delete should return the new version number, which should
     # be greater than the old version number
     # check the returned value - should be the new version number
     # valid delete should return the new version number, which should
     # be greater than the old version number

-    #assert @response.body.to_i > current_ways(:visible_way).version,
+    # assert @response.body.to_i > current_ways(:visible_way).version,

     #   "delete request should return a new version number for way"
 
     # this won't work since the way is already deleted
     #   "delete request should return a new version number for way"
 
     # this won't work since the way is already deleted


@@ -301,16 +300,15 @@ class WayControllerTest < ActionController::TestCase
     content current_ways(:used_way).to_xml
     delete :delete, :id => current_ways(:used_way).id
     assert_response :forbidden,
     content current_ways(:used_way).to_xml
     delete :delete, :id => current_ways(:used_way).id
     assert_response :forbidden,

-    "shouldn't be able to delete a way used in a relation (#{@response.body}), when done by a private user"
+                    "shouldn't be able to delete a way used in a relation (#{@response.body}), when done by a private user"

 
     # this won't work since the way never existed
     delete :delete, :id => 0
     assert_response :forbidden
 
 
     # this won't work since the way never existed
     delete :delete, :id => 0
     assert_response :forbidden
 

-

     ### Now check with a public user
     # now set auth
     ### Now check with a public user
     # now set auth

-    basic_authorization(users(:public_user).email, "test");
+    basic_authorization(users(:public_user).email, "test")

 
     # this shouldn't work as with the 0.6 api we need pay load to delete
     delete :delete, :id => current_ways(:visible_way).id
 
     # this shouldn't work as with the 0.6 api we need pay load to delete
     delete :delete, :id => current_ways(:visible_way).id


@@ -328,7 +326,7 @@ class WayControllerTest < ActionController::TestCase
     assert_response :conflict
 
     # try to delete with an invalid (non-existent) changeset
     assert_response :conflict
 
     # try to delete with an invalid (non-existent) changeset

-    content update_changeset(current_ways(:visible_way).to_xml,0)
+    content update_changeset(current_ways(:visible_way).to_xml, 0)

     delete :delete, :id => current_ways(:visible_way).id
     assert_response :conflict
 
     delete :delete, :id => current_ways(:visible_way).id
     assert_response :conflict
 


@@ -341,7 +339,7 @@ class WayControllerTest < ActionController::TestCase
     # valid delete should return the new version number, which should
     # be greater than the old version number
     assert @response.body.to_i > current_ways(:visible_way).version,
     # valid delete should return the new version number, which should
     # be greater than the old version number
     assert @response.body.to_i > current_ways(:visible_way).version,

-       "delete request should return a new version number for way"
+           "delete request should return a new version number for way"

 
     # this won't work since the way is already deleted
     content current_ways(:invisible_way).to_xml
 
     # this won't work since the way is already deleted
     content current_ways(:invisible_way).to_xml


@@ -352,7 +350,7 @@ class WayControllerTest < ActionController::TestCase
     content current_ways(:used_way).to_xml
     delete :delete, :id => current_ways(:used_way).id
     assert_response :precondition_failed,
     content current_ways(:used_way).to_xml
     delete :delete, :id => current_ways(:used_way).id
     assert_response :precondition_failed,

-       "shouldn't be able to delete a way used in a relation (#{@response.body})"
+                    "shouldn't be able to delete a way used in a relation (#{@response.body})"

     assert_equal "Precondition failed: Way 3 is still used by relations 1.", @response.body
 
     # this won't work since the way never existed
     assert_equal "Precondition failed: Way 3 is still used by relations 1.", @response.body
 
     # this won't work since the way never existed


@@ -384,7 +382,7 @@ class WayControllerTest < ActionController::TestCase
     content way_xml
     put :update, :id => current_ways(:visible_way).id
     assert_response :forbidden,
     content way_xml
     put :update, :id => current_ways(:visible_way).id
     assert_response :forbidden,

-    "adding a duplicate tag to a way for a non-public should fail with 'forbidden'"
+                    "adding a duplicate tag to a way for a non-public should fail with 'forbidden'"

 
     ## Now try with the public user
     # setup auth
 
     ## Now try with the public user
     # setup auth


@@ -403,7 +401,7 @@ class WayControllerTest < ActionController::TestCase
     content way_xml
     put :update, :id => current_ways(:visible_way).id
     assert_response :bad_request,
     content way_xml
     put :update, :id => current_ways(:visible_way).id
     assert_response :bad_request,

-       "adding a duplicate tag to a way should fail with 'bad request'"
+                    "adding a duplicate tag to a way should fail with 'bad request'"

     assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key #{current_way_tags(:t1).k}", @response.body
   end
 
     assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key #{current_way_tags(:t1).k}", @response.body
   end
 


@@ -429,7 +427,7 @@ class WayControllerTest < ActionController::TestCase
     content way_xml
     put :update, :id => current_ways(:visible_way).id
     assert_response :forbidden,
     content way_xml
     put :update, :id => current_ways(:visible_way).id
     assert_response :forbidden,

-    "adding new duplicate tags to a way using a non-public user should fail with 'forbidden'"
+                    "adding new duplicate tags to a way using a non-public user should fail with 'forbidden'"

 
     ## Now test with the public user
     # setup auth
 
     ## Now test with the public user
     # setup auth


@@ -450,9 +448,8 @@ class WayControllerTest < ActionController::TestCase
     content way_xml
     put :update, :id => current_ways(:visible_way).id
     assert_response :bad_request,
     content way_xml
     put :update, :id => current_ways(:visible_way).id
     assert_response :bad_request,

-       "adding new duplicate tags to a way should fail with 'bad request'"
+                    "adding new duplicate tags to a way should fail with 'bad request'"

     assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key i_am_a_duplicate", @response.body
     assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key i_am_a_duplicate", @response.body

-

   end
 
   ##
   end
 
   ##


@@ -468,13 +465,13 @@ class WayControllerTest < ActionController::TestCase
     way_str = "<osm><way changeset='1'>"
     way_str << "<tag k='addr:housenumber' v='1'/>"
     way_str << "<tag k='addr:housenumber' v='2'/>"
     way_str = "<osm><way changeset='1'>"
     way_str << "<tag k='addr:housenumber' v='1'/>"
     way_str << "<tag k='addr:housenumber' v='2'/>"

-    way_str << "</way></osm>";
+    way_str << "</way></osm>"

 
     # try and upload it
     content way_str
     put :create
     assert_response :forbidden,
 
     # try and upload it
     content way_str
     put :create
     assert_response :forbidden,

-    "adding new duplicate tags to a way with a non-public user should fail with 'forbidden'"
+                    "adding new duplicate tags to a way with a non-public user should fail with 'forbidden'"

 
     ## Now do it with a public user
     # setup auth
 
     ## Now do it with a public user
     # setup auth


@@ -484,13 +481,13 @@ class WayControllerTest < ActionController::TestCase
     way_str = "<osm><way changeset='1'>"
     way_str << "<tag k='addr:housenumber' v='1'/>"
     way_str << "<tag k='addr:housenumber' v='2'/>"
     way_str = "<osm><way changeset='1'>"
     way_str << "<tag k='addr:housenumber' v='1'/>"
     way_str << "<tag k='addr:housenumber' v='2'/>"

-    way_str << "</way></osm>";
+    way_str << "</way></osm>"

 
     # try and upload it
     content way_str
     put :create
     assert_response :bad_request,
 
     # try and upload it
     content way_str
     put :create
     assert_response :bad_request,

-    "adding new duplicate tags to a way should fail with 'bad request'"
+                    "adding new duplicate tags to a way should fail with 'bad request'"

     assert_equal "Element way/ has duplicate tags with key addr:housenumber", @response.body
   end
 
     assert_equal "Element way/ has duplicate tags with key addr:housenumber", @response.body
   end
 


@@ -506,12 +503,12 @@ class WayControllerTest < ActionController::TestCase
     assert_not_nil ways_xml, "failed to parse ways_for_node response"
 
     # check that the set of IDs match expectations
     assert_not_nil ways_xml, "failed to parse ways_for_node response"
 
     # check that the set of IDs match expectations

-    expected_way_ids = [ current_ways(:visible_way).id,
-                         current_ways(:used_way).id
+    expected_way_ids = [current_ways(:visible_way).id,
+                        current_ways(:used_way).id

                        ]
     found_way_ids = ways_xml.find("//osm/way").collect { |w| w["id"].to_i }
     assert_equal expected_way_ids.sort, found_way_ids.sort,
                        ]
     found_way_ids = ways_xml.find("//osm/way").collect { |w| w["id"].to_i }
     assert_equal expected_way_ids.sort, found_way_ids.sort,

-      "expected ways for node #{current_nodes(:used_node_1).id} did not match found"
+                 "expected ways for node #{current_nodes(:used_node_1).id} did not match found"

 
     # check the full ways to ensure we're not missing anything
     expected_way_ids.each do |id|
 
     # check the full ways to ensure we're not missing anything
     expected_way_ids.each do |id|


@@ -531,6 +528,6 @@ class WayControllerTest < ActionController::TestCase
   # update an attribute in the node element
   def xml_attr_rewrite(xml, name, value)
     xml.find("//osm/way").first[name] = value.to_s
   # update an attribute in the node element
   def xml_attr_rewrite(xml, name, value)
     xml.find("//osm/way").first[name] = value.to_s

-    return xml
+    xml

   end
 end
   end
 end