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

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

diff --git a/test/models/way_test.rb b/test/models/way_test.rb
index ed8a6cea3e794981d23272fe5da060a646f0539c..3c44f2f26bd6ddb5975920b2e6948038defb5e4f 100644 (file)
--- a/test/models/way_test.rb
+++ b/test/models/way_test.rb
@@ -1,14 +1,6 @@
 require "test_helper"
 
 class WayTest < ActiveSupport::TestCase
-  api_fixtures
-
-  # Check that we have the correct number of currnet ways in the db
-  # This will need to updated whenever the current_ways.yml is updated
-  def test_db_count
-    assert_equal 7, Way.count
-  end
-
   def test_bbox
     node = create(:node)
     visible_way = create(:way)
@@ -37,7 +29,7 @@ class WayTest < ActiveSupport::TestCase
     # Take one of the current ways and add nodes to it until we are near the limit
     assert way.valid?
     # it already has 1 node
-    1.upto(MAX_NUMBER_OF_WAY_NODES / 2) do
+    1.upto(Settings.max_number_of_way_nodes / 2) do
       way.add_nd_num(node_a.id)
       way.add_nd_num(node_b.id)
     end
@@ -50,13 +42,13 @@ class WayTest < ActiveSupport::TestCase
 
   def test_from_xml_no_id
     noid = "<osm><way version='12' changeset='23' /></osm>"
-    assert_nothing_raised(OSM::APIBadXMLError) do
+    assert_nothing_raised do
       Way.from_xml(noid, true)
     end
     message = assert_raise(OSM::APIBadXMLError) do
       Way.from_xml(noid, false)
     end
-    assert_match /ID is required when updating/, message.message
+    assert_match(/ID is required when updating/, message.message)
   end
 
   def test_from_xml_no_changeset_id
@@ -64,35 +56,35 @@ class WayTest < ActiveSupport::TestCase
     message_create = assert_raise(OSM::APIBadXMLError) do
       Way.from_xml(nocs, true)
     end
-    assert_match /Changeset id is missing/, message_create.message
+    assert_match(/Changeset id is missing/, message_create.message)
     message_update = assert_raise(OSM::APIBadXMLError) do
       Way.from_xml(nocs, false)
     end
-    assert_match /Changeset id is missing/, message_update.message
+    assert_match(/Changeset id is missing/, message_update.message)
   end
 
   def test_from_xml_no_version
     no_version = "<osm><way id='123' changeset='23' /></osm>"
-    assert_nothing_raised(OSM::APIBadXMLError) do
+    assert_nothing_raised do
       Way.from_xml(no_version, true)
     end
     message_update = assert_raise(OSM::APIBadXMLError) do
       Way.from_xml(no_version, false)
     end
-    assert_match /Version is required when updating/, message_update.message
+    assert_match(/Version is required when updating/, message_update.message)
   end
 
   def test_from_xml_id_zero
     id_list = ["", "0", "00", "0.0", "a"]
     id_list.each do |id|
       zero_id = "<osm><way id='#{id}' changeset='33' version='23' /></osm>"
-      assert_nothing_raised(OSM::APIBadUserInput) do
+      assert_nothing_raised do
         Way.from_xml(zero_id, true)
       end
       message_update = assert_raise(OSM::APIBadUserInput) do
         Way.from_xml(zero_id, false)
       end
-      assert_match /ID of way cannot be zero when updating/, message_update.message
+      assert_match(/ID of way cannot be zero when updating/, message_update.message)
     end
   end
 
@@ -101,11 +93,11 @@ class WayTest < ActiveSupport::TestCase
     message_create = assert_raise(OSM::APIBadXMLError) do
       Way.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
       Way.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_k_v
@@ -113,11 +105,11 @@ class WayTest < ActiveSupport::TestCase
     message_create = assert_raise(OSM::APIBadXMLError) do
       Way.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
       Way.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
@@ -125,11 +117,11 @@ class WayTest < ActiveSupport::TestCase
     message_create = assert_raise(OSM::APIBadXMLError) do
       Way.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
       Way.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