X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dae3dcf87edcfc0648cd0b93b069b0eee67d3ab7..f20b250ba97e5330d83fc2fdd421f0bbcb4aacba:/test/models/changeset_test.rb diff --git a/test/models/changeset_test.rb b/test/models/changeset_test.rb index 89200c9b5..3be9a52e6 100644 --- a/test/models/changeset_test.rb +++ b/test/models/changeset_test.rb @@ -1,32 +1,26 @@ require "test_helper" class ChangesetTest < ActiveSupport::TestCase - api_fixtures - - def test_changeset_count - assert_equal 9, Changeset.count - end - def test_from_xml_no_text no_text = "" message_create = assert_raise(OSM::APIBadXMLError) do - Changeset.from_xml(no_text, true) + Changeset.from_xml(no_text, :create => 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 - Changeset.from_xml(no_text, false) + Changeset.from_xml(no_text, :create => 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_changeset nocs = "" message_create = assert_raise(OSM::APIBadXMLError) do - Changeset.from_xml(nocs, true) + Changeset.from_xml(nocs, :create => true) 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) + Changeset.from_xml(nocs, :create => false) end assert_match %r{XML doesn't contain an osm/changeset element}, message_update.message end @@ -34,35 +28,35 @@ class ChangesetTest < ActiveSupport::TestCase def test_from_xml_no_k_v nokv = "" message_create = assert_raise(OSM::APIBadXMLError) do - Changeset.from_xml(nokv, true) + Changeset.from_xml(nokv, :create => 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 - Changeset.from_xml(nokv, false) + Changeset.from_xml(nokv, :create => 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 no_v = "" message_create = assert_raise(OSM::APIBadXMLError) do - Changeset.from_xml(no_v, true) + Changeset.from_xml(no_v, :create => 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 - Changeset.from_xml(no_v, false) + Changeset.from_xml(no_v, :create => 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 dupk = "" message_create = assert_raise(OSM::APIDuplicateTagsError) do - Changeset.from_xml(dupk, true) + Changeset.from_xml(dupk, :create => true) end assert_equal "Element changeset/ has duplicate tags with key dup", message_create.message message_update = assert_raise(OSM::APIDuplicateTagsError) do - Changeset.from_xml(dupk, false) + Changeset.from_xml(dupk, :create => false) end assert_equal "Element changeset/ has duplicate tags with key dup", message_update.message end @@ -70,11 +64,11 @@ class ChangesetTest < ActiveSupport::TestCase 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) do - Changeset.from_xml(xml, false) + assert_nothing_raised do + Changeset.from_xml(xml, :create => false) end - assert_nothing_raised(OSM::APIBadXMLError) do - Changeset.from_xml(xml, true) + assert_nothing_raised do + Changeset.from_xml(xml, :create => true) end end end