Update to iD v2.9.2

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

diff --git a/test/models/changeset_test.rb b/test/models/changeset_test.rb
index f1ed1134ecd1214285b0b99b46eb3713402c6df1..cdb1a8e85c409edab877b94ed42d9f5591be03a2 100644 (file)
--- a/test/models/changeset_test.rb
+++ b/test/models/changeset_test.rb
@@ -1,12 +1,6 @@
-require 'test_helper'
+require "test_helper"

 
 class ChangesetTest < ActiveSupport::TestCase
 
 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
   def test_from_xml_no_text
     no_text = ""
     message_create = assert_raise(OSM::APIBadXMLError) do


@@ -24,11 +18,11 @@ class ChangesetTest < ActiveSupport::TestCase
     message_create = assert_raise(OSM::APIBadXMLError) do
       Changeset.from_xml(nocs, true)
     end
     message_create = assert_raise(OSM::APIBadXMLError) do
       Changeset.from_xml(nocs, true)
     end

-    assert_match /XML doesn't contain an osm\/changeset element/, message_create.message
+    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)
     end
     message_update = assert_raise(OSM::APIBadXMLError) do
       Changeset.from_xml(nocs, false)
     end

-    assert_match /XML doesn't contain an osm\/changeset element/, message_update.message
+    assert_match %r{XML doesn't contain an osm/changeset element}, message_update.message

   end
 
   def test_from_xml_no_k_v
   end
 
   def test_from_xml_no_k_v


@@ -40,7 +34,7 @@ class ChangesetTest < ActiveSupport::TestCase
     message_update = assert_raise(OSM::APIBadXMLError) do
       Changeset.from_xml(nokv, false)
     end
     message_update = assert_raise(OSM::APIBadXMLError) do
       Changeset.from_xml(nokv, false)
     end

-    assert_match /tag is missing key/, message_create.message
+    assert_match /tag is missing key/, message_update.message

   end
 
   def test_from_xml_no_v
   end
 
   def test_from_xml_no_v


@@ -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>"
   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
       Changeset.from_xml(xml, false)
     end

-    assert_nothing_raised(OSM::APIBadXMLError) do
+    assert_nothing_raised do

       Changeset.from_xml(xml, true)
     end
   end
       Changeset.from_xml(xml, true)
     end
   end