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

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

diff --git a/test/models/changeset_test.rb b/test/models/changeset_test.rb
index b4229b20324b164d1959beddb67cbcf1e4754bf4..bc8c84fb1f0a0a017d183c144e8dc80fc98a8a6e 100644 (file)
--- a/test/models/changeset_test.rb
+++ b/test/models/changeset_test.rb
@@ -1,22 +1,16 @@
 require "test_helper"
 
 class ChangesetTest < ActiveSupport::TestCase
-  api_fixtures
-
-  def test_changeset_count
-    assert_equal 8, Changeset.count
-  end
-
   def test_from_xml_no_text
     no_text = ""
     message_create = assert_raise(OSM::APIBadXMLError) do
       Changeset.from_xml(no_text, 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)
     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
@@ -36,11 +30,11 @@ class ChangesetTest < ActiveSupport::TestCase
     message_create = assert_raise(OSM::APIBadXMLError) do
       Changeset.from_xml(nokv, 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)
     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
@@ -48,11 +42,11 @@ class ChangesetTest < ActiveSupport::TestCase
     message_create = assert_raise(OSM::APIBadXMLError) do
       Changeset.from_xml(no_v, 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)
     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
@@ -70,10 +64,10 @@ 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 = "<osm><changeset><tag k=\"comment\" v=\"Just adding some streetnames and a restaurant\"/></changeset></osm>"
-    assert_nothing_raised(OSM::APIBadXMLError) do
+    assert_nothing_raised do
       Changeset.from_xml(xml, false)
     end
-    assert_nothing_raised(OSM::APIBadXMLError) do
+    assert_nothing_raised do
       Changeset.from_xml(xml, true)
     end
   end