Merge remote-tracking branch 'upstream/pull/4425'

[rails.git] / test / models / changeset_test.rb

diff --git a/test/models/changeset_test.rb b/test/models/changeset_test.rb
index cdb1a8e85c409edab877b94ed42d9f5591be03a2..3be9a52e636fc8ba9d58d64c5022226a673f480f 100644 (file)
--- a/test/models/changeset_test.rb
+++ b/test/models/changeset_test.rb
@@ -4,23 +4,23 @@ class ChangesetTest < ActiveSupport::TestCase
   def test_from_xml_no_text
     no_text = ""
     message_create = assert_raise(OSM::APIBadXMLError) do
   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
     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
     message_update = assert_raise(OSM::APIBadXMLError) do

-      Changeset.from_xml(no_text, false)
+      Changeset.from_xml(no_text, :create => false)

     end
     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 = "<osm></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) do
   end
 
   def test_from_xml_no_changeset
     nocs = "<osm></osm>"
     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
     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
     end
     assert_match %r{XML doesn't contain an osm/changeset element}, message_update.message
   end


@@ -28,35 +28,35 @@ class ChangesetTest < ActiveSupport::TestCase
   def test_from_xml_no_k_v
     nokv = "<osm><changeset><tag /></changeset></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) do
   def test_from_xml_no_k_v
     nokv = "<osm><changeset><tag /></changeset></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) do

-      Changeset.from_xml(nokv, true)
+      Changeset.from_xml(nokv, :create => true)

     end
     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
     message_update = assert_raise(OSM::APIBadXMLError) do

-      Changeset.from_xml(nokv, false)
+      Changeset.from_xml(nokv, :create => false)

     end
     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 = "<osm><changeset><tag k='key' /></changeset></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) do
   end
 
   def test_from_xml_no_v
     no_v = "<osm><changeset><tag k='key' /></changeset></osm>"
     message_create = assert_raise(OSM::APIBadXMLError) do

-      Changeset.from_xml(no_v, true)
+      Changeset.from_xml(no_v, :create => true)

     end
     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
     message_update = assert_raise(OSM::APIBadXMLError) do

-      Changeset.from_xml(no_v, false)
+      Changeset.from_xml(no_v, :create => false)

     end
     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 = "<osm><changeset><tag k='dup' v='test' /><tag k='dup' v='value' /></changeset></osm>"
     message_create = assert_raise(OSM::APIDuplicateTagsError) do
   end
 
   def test_from_xml_duplicate_k
     dupk = "<osm><changeset><tag k='dup' v='test' /><tag k='dup' v='value' /></changeset></osm>"
     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
     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
     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 = "<osm><changeset><tag k=\"comment\" v=\"Just adding some streetnames and a restaurant\"/></changeset></osm>"
     assert_nothing_raised do
     # Example taken from the Update section on the API_v0.6 docs on the wiki
     xml = "<osm><changeset><tag k=\"comment\" v=\"Just adding some streetnames and a restaurant\"/></changeset></osm>"
     assert_nothing_raised do

-      Changeset.from_xml(xml, false)
+      Changeset.from_xml(xml, :create => false)

     end
     assert_nothing_raised do
     end
     assert_nothing_raised do

-      Changeset.from_xml(xml, true)
+      Changeset.from_xml(xml, :create => true)

     end
   end
 end
     end
   end
 end