X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/eab2eeaa47b2aa8c7f52371f9bfdd60711a41fb6..b29189e856a0447612e99f7337341a9486d1e4f2:/test/models/changeset_test.rb

diff --git a/test/models/changeset_test.rb b/test/models/changeset_test.rb
index b6e5ba46a..3be9a52e6 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) {
-      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) {
-      Changeset.from_xml(no_text, false)
-    }
-    assert_match /Must specify a string with one or more characters/, message_update.message
+    message_create = assert_raise(OSM::APIBadXMLError) do
+      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, :create => false)
+    end
+    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) {
-      Changeset.from_xml(nocs, true)
-    }
-    assert_match /XML doesn't contain an osm\/changeset element/, message_create.message
-    message_update = assert_raise(OSM::APIBadXMLError) {
-      Changeset.from_xml(nocs, false)
-    }
-    assert_match /XML doesn't contain an osm\/changeset element/, message_update.message
+    message_create = assert_raise(OSM::APIBadXMLError) do
+      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, :create => false)
+    end
+    assert_match %r{XML doesn't contain an osm/changeset element}, message_update.message
   end
 
   def test_from_xml_no_k_v
     nokv = "<osm><changeset><tag /></changeset></osm>"
-    message_create = assert_raise(OSM::APIBadXMLError) {
-      Changeset.from_xml(nokv, true)
-    }
-    assert_match /tag is missing key/, message_create.message
-    message_update = assert_raise(OSM::APIBadXMLError) {
-      Changeset.from_xml(nokv, false)
-    }
-    assert_match /tag is missing key/, message_create.message
+    message_create = assert_raise(OSM::APIBadXMLError) do
+      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, :create => false)
+    end
+    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) {
-      Changeset.from_xml(no_v, true)
-    }
-    assert_match /tag is missing value/, message_create.message
-    message_update = assert_raise(OSM::APIBadXMLError) {
-      Changeset.from_xml(no_v, false)
-    }
-    assert_match /tag is missing value/, message_update.message
+    message_create = assert_raise(OSM::APIBadXMLError) do
+      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, :create => false)
+    end
+    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) {
-      Changeset.from_xml(dupk, true)
-    }
+    message_create = assert_raise(OSM::APIDuplicateTagsError) do
+      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) {
-      Changeset.from_xml(dupk, false)
-    }
+    message_update = assert_raise(OSM::APIDuplicateTagsError) do
+      Changeset.from_xml(dupk, :create => 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 = "<osm><changeset><tag k=\"comment\" v=\"Just adding some streetnames and a restaurant\"/></changeset></osm>"
-    assert_nothing_raised(OSM::APIBadXMLError) {
-      Changeset.from_xml(xml, false)
-    }
-    assert_nothing_raised(OSM::APIBadXMLError) {
-      Changeset.from_xml(xml, true)
-    }
+    assert_nothing_raised do
+      Changeset.from_xml(xml, :create => false)
+    end
+    assert_nothing_raised do
+      Changeset.from_xml(xml, :create => true)
+    end
   end
 end