X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/420a7289a0b08eee091f6650c2e83166df3fbe69..ffe637f23d81a9e9ba769020ad0ffbb04a5e3a7d:/test/models/changeset_test.rb
diff --git a/test/models/changeset_test.rb b/test/models/changeset_test.rb
index bc8c84fb1..3be9a52e6 100644
--- a/test/models/changeset_test.rb
+++ b/test/models/changeset_test.rb
@@ -4,11 +4,11 @@ class ChangesetTest < ActiveSupport::TestCase
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)
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)
end
@@ -16,11 +16,11 @@ class ChangesetTest < ActiveSupport::TestCase
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
@@ -28,11 +28,11 @@ 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)
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)
end
@@ -40,11 +40,11 @@ class ChangesetTest < ActiveSupport::TestCase
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)
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)
end
@@ -52,11 +52,11 @@ class ChangesetTest < ActiveSupport::TestCase
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
@@ -65,10 +65,10 @@ class ChangesetTest < ActiveSupport::TestCase
# Example taken from the Update section on the API_v0.6 docs on the wiki
xml = ""
assert_nothing_raised do
- Changeset.from_xml(xml, false)
+ Changeset.from_xml(xml, :create => false)
end
assert_nothing_raised do
- Changeset.from_xml(xml, true)
+ Changeset.from_xml(xml, :create => true)
end
end
end