X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f228437324d80cb8a408d27912cc716a36aa3b0..edfbbf7336a38162b2d996ebca21918a5d6039a0:/test/models/changeset_test.rb?ds=inline diff --git a/test/models/changeset_test.rb b/test/models/changeset_test.rb index 715a90b92..b4229b203 100644 --- a/test/models/changeset_test.rb +++ b/test/models/changeset_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require "test_helper" class ChangesetTest < ActiveSupport::TestCase api_fixtures @@ -9,72 +9,72 @@ class ChangesetTest < ActiveSupport::TestCase def test_from_xml_no_text no_text = "" - message_create = assert_raise(OSM::APIBadXMLError) { + message_create = assert_raise(OSM::APIBadXMLError) do Changeset.from_xml(no_text, true) - } + end assert_match /Must specify a string with one or more characters/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + message_update = assert_raise(OSM::APIBadXMLError) do Changeset.from_xml(no_text, false) - } + end assert_match /Must specify a string with one or more characters/, message_update.message end def test_from_xml_no_changeset nocs = "" - message_create = assert_raise(OSM::APIBadXMLError) { + message_create = assert_raise(OSM::APIBadXMLError) do Changeset.from_xml(nocs, true) - } - assert_match /XML doesn't contain an osm\/changeset element/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + end + assert_match %r{XML doesn't contain an osm/changeset element}, message_create.message + message_update = assert_raise(OSM::APIBadXMLError) do Changeset.from_xml(nocs, false) - } - assert_match /XML doesn't contain an osm\/changeset element/, message_update.message + end + assert_match %r{XML doesn't contain an osm/changeset element}, message_update.message end def test_from_xml_no_k_v nokv = "" - message_create = assert_raise(OSM::APIBadXMLError) { + message_create = assert_raise(OSM::APIBadXMLError) do Changeset.from_xml(nokv, true) - } + end assert_match /tag is missing key/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + message_update = assert_raise(OSM::APIBadXMLError) do Changeset.from_xml(nokv, false) - } - assert_match /tag is missing key/, message_create.message + end + assert_match /tag is missing key/, message_update.message end def test_from_xml_no_v no_v = "" - message_create = assert_raise(OSM::APIBadXMLError) { + message_create = assert_raise(OSM::APIBadXMLError) do Changeset.from_xml(no_v, true) - } + end assert_match /tag is missing value/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + message_update = assert_raise(OSM::APIBadXMLError) do Changeset.from_xml(no_v, false) - } + end assert_match /tag is missing value/, message_update.message end def test_from_xml_duplicate_k dupk = "" - message_create = assert_raise(OSM::APIDuplicateTagsError) { + message_create = assert_raise(OSM::APIDuplicateTagsError) do Changeset.from_xml(dupk, true) - } + end assert_equal "Element changeset/ has duplicate tags with key dup", message_create.message - message_update = assert_raise(OSM::APIDuplicateTagsError) { + message_update = assert_raise(OSM::APIDuplicateTagsError) do Changeset.from_xml(dupk, false) - } + end assert_equal "Element changeset/ has duplicate tags with key dup", message_update.message end def test_from_xml_valid # Example taken from the Update section on the API_v0.6 docs on the wiki xml = "" - assert_nothing_raised(OSM::APIBadXMLError) { + assert_nothing_raised(OSM::APIBadXMLError) do Changeset.from_xml(xml, false) - } - assert_nothing_raised(OSM::APIBadXMLError) { + end + assert_nothing_raised(OSM::APIBadXMLError) do Changeset.from_xml(xml, true) - } + end end end