X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2479319b7859d9b271dc8900e5d530c77976025a..68845eb7253cd3da14253e004fc1a4fc7eac2e5e:/test/controllers/api/nodes_controller_test.rb diff --git a/test/controllers/api/nodes_controller_test.rb b/test/controllers/api/nodes_controller_test.rb index 339dd2af8..2d827a077 100644 --- a/test/controllers/api/nodes_controller_test.rb +++ b/test/controllers/api/nodes_controller_test.rb @@ -86,7 +86,7 @@ module Api end def test_create_invalid_xml - ## Only test public user here, as test_create should cover what's the forbiddens + ## Only test public user here, as test_create should cover what's the forbidden ## that would occur here user = create(:user) @@ -138,7 +138,7 @@ module Api xml = "" put node_create_path, :params => xml, :headers => auth_header assert_response :bad_request, "node upload did not return bad_request status" - assert_equal ["NodeTag ", " v: is too long (maximum is 255 characters) (\"#{'x' * 256}\")"], @response.body.split(/[0-9]+,foo:/) + assert_match(/ v: is too long \(maximum is 255 characters\) /, @response.body) end def test_show @@ -258,8 +258,7 @@ module Api # valid delete should return the new version number, which should # be greater than the old version number - assert @response.body.to_i > node.version, - "delete request should return a new version number for node" + assert_operator @response.body.to_i, :>, node.version, "delete request should return a new version number for node" # deleting the same node twice doesn't work xml = xml_for_node(node) @@ -527,7 +526,7 @@ module Api # try and put something into a string that the API might # use unquoted and therefore allow code injection... xml = "" \ - '' \ + "" \ "" put node_create_path, :params => xml, :headers => auth_header assert_require_public_data "Shouldn't be able to create with non-public user" @@ -538,7 +537,7 @@ module Api # try and put something into a string that the API might # use unquoted and therefore allow code injection... xml = "" \ - '' \ + "" \ "" put node_create_path, :params => xml, :headers => auth_header assert_response :success