X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b00b9ce6265fea04e484e7a0555f9dd37aceb713..05858662021553ce0b86720dd62ccbd08788979f:/test/models/way_test.rb?ds=inline diff --git a/test/models/way_test.rb b/test/models/way_test.rb index 6abf99c57..3c44f2f26 100644 --- a/test/models/way_test.rb +++ b/test/models/way_test.rb @@ -29,7 +29,7 @@ class WayTest < ActiveSupport::TestCase # Take one of the current ways and add nodes to it until we are near the limit assert way.valid? # it already has 1 node - 1.upto(MAX_NUMBER_OF_WAY_NODES / 2) do + 1.upto(Settings.max_number_of_way_nodes / 2) do way.add_nd_num(node_a.id) way.add_nd_num(node_b.id) end @@ -48,7 +48,7 @@ class WayTest < ActiveSupport::TestCase message = assert_raise(OSM::APIBadXMLError) do Way.from_xml(noid, false) end - assert_match /ID is required when updating/, message.message + assert_match(/ID is required when updating/, message.message) end def test_from_xml_no_changeset_id @@ -56,11 +56,11 @@ class WayTest < ActiveSupport::TestCase message_create = assert_raise(OSM::APIBadXMLError) do Way.from_xml(nocs, true) end - assert_match /Changeset id is missing/, message_create.message + assert_match(/Changeset id is missing/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do Way.from_xml(nocs, false) end - assert_match /Changeset id is missing/, message_update.message + assert_match(/Changeset id is missing/, message_update.message) end def test_from_xml_no_version @@ -71,7 +71,7 @@ class WayTest < ActiveSupport::TestCase message_update = assert_raise(OSM::APIBadXMLError) do Way.from_xml(no_version, false) end - assert_match /Version is required when updating/, message_update.message + assert_match(/Version is required when updating/, message_update.message) end def test_from_xml_id_zero @@ -84,7 +84,7 @@ class WayTest < ActiveSupport::TestCase message_update = assert_raise(OSM::APIBadUserInput) do Way.from_xml(zero_id, false) end - assert_match /ID of way cannot be zero when updating/, message_update.message + assert_match(/ID of way cannot be zero when updating/, message_update.message) end end @@ -93,11 +93,11 @@ class WayTest < ActiveSupport::TestCase message_create = assert_raise(OSM::APIBadXMLError) do Way.from_xml(no_text, true) end - assert_match /Must specify a string with one or more characters/, message_create.message + assert_match(/Must specify a string with one or more characters/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do Way.from_xml(no_text, false) end - assert_match /Must specify a string with one or more characters/, message_update.message + assert_match(/Must specify a string with one or more characters/, message_update.message) end def test_from_xml_no_k_v @@ -105,11 +105,11 @@ class WayTest < ActiveSupport::TestCase message_create = assert_raise(OSM::APIBadXMLError) do Way.from_xml(nokv, true) end - assert_match /tag is missing key/, message_create.message + assert_match(/tag is missing key/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do Way.from_xml(nokv, false) end - assert_match /tag is missing key/, message_update.message + assert_match(/tag is missing key/, message_update.message) end def test_from_xml_no_v @@ -117,11 +117,11 @@ class WayTest < ActiveSupport::TestCase message_create = assert_raise(OSM::APIBadXMLError) do Way.from_xml(no_v, true) end - assert_match /tag is missing value/, message_create.message + assert_match(/tag is missing value/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do Way.from_xml(no_v, false) end - assert_match /tag is missing value/, message_update.message + assert_match(/tag is missing value/, message_update.message) end def test_from_xml_duplicate_k