X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b095b59d5e0ee805e49980af80b21bd1acff1345..9f7ec064e448a745e0ea2615a089f0988215dec6:/test/models/changeset_test.rb?ds=sidebyside diff --git a/test/models/changeset_test.rb b/test/models/changeset_test.rb index b6e5ba46a..bc8c84fb1 100644 --- a/test/models/changeset_test.rb +++ b/test/models/changeset_test.rb @@ -1,80 +1,74 @@ -require 'test_helper' +require "test_helper" class ChangesetTest < ActiveSupport::TestCase - api_fixtures - - def test_changeset_count - assert_equal 7, Changeset.count - end - 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) - } - assert_match /Must specify a string with one or more characters/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + end + assert_match(/Must specify a string with one or more characters/, message_create.message) + message_update = assert_raise(OSM::APIBadXMLError) do Changeset.from_xml(no_text, false) - } - assert_match /Must specify a string with one or more characters/, message_update.message + 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) - } - assert_match /tag is missing key/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + end + assert_match(/tag is missing key/, message_create.message) + 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) - } - assert_match /tag is missing value/, message_create.message - message_update = assert_raise(OSM::APIBadXMLError) { + end + assert_match(/tag is missing value/, message_create.message) + message_update = assert_raise(OSM::APIBadXMLError) do Changeset.from_xml(no_v, false) - } - assert_match /tag is missing value/, message_update.message + 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 do Changeset.from_xml(xml, false) - } - assert_nothing_raised(OSM::APIBadXMLError) { + end + assert_nothing_raised do Changeset.from_xml(xml, true) - } + end end end