X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5d0ea2879632a950405c40823503640cbec65e8f..9f7ec064e448a745e0ea2615a089f0988215dec6:/test/models/way_test.rb
diff --git a/test/models/way_test.rb b/test/models/way_test.rb
index 4519ebba8..3c44f2f26 100644
--- a/test/models/way_test.rb
+++ b/test/models/way_test.rb
@@ -29,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
@@ -42,13 +42,13 @@ class WayTest < ActiveSupport::TestCase
def test_from_xml_no_id
noid = ""
- 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
@@ -56,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 = ""
- 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 = ""
- 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
@@ -93,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
@@ -105,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
@@ -117,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