From b00b9ce6265fea04e484e7a0555f9dd37aceb713 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 2 Jun 2017 15:44:16 +0100 Subject: [PATCH] Remove arguments from assert_nothing_raised It has never done anything with the argument and rails 5.0 warns that rails 5.1 will remove the argument. --- test/lib/bounding_box_test.rb | 6 +++--- test/models/changeset_test.rb | 4 ++-- test/models/node_test.rb | 6 +++--- test/models/redaction_test.rb | 2 +- test/models/relation_test.rb | 6 +++--- test/models/way_test.rb | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/test/lib/bounding_box_test.rb b/test/lib/bounding_box_test.rb index dda8b0e67..52d0b8388 100644 --- a/test/lib/bounding_box_test.rb +++ b/test/lib/bounding_box_test.rb @@ -151,7 +151,7 @@ class BoundingBoxTest < ActiveSupport::TestCase def test_good_bbox_boundaries @good_bbox.each do |bbox_string| - assert_nothing_raised(OSM::APIBadBoundingBox) { BoundingBox.from_s(bbox_string).check_boundaries } + assert_nothing_raised { BoundingBox.from_s(bbox_string).check_boundaries } end end @@ -196,14 +196,14 @@ class BoundingBoxTest < ActiveSupport::TestCase def test_good_bbox_size @good_bbox.each do |bbox_string| - assert_nothing_raised(OSM::APIBadBoundingBox) { BoundingBox.from_s(bbox_string).check_size } + assert_nothing_raised { BoundingBox.from_s(bbox_string).check_size } end end def test_size_to_big @bad_big_bbox.each do |bbox_string| bbox = nil - assert_nothing_raised(OSM::APIBadBoundingBox) { bbox = BoundingBox.from_bbox_params(:bbox => bbox_string).check_boundaries } + assert_nothing_raised { bbox = BoundingBox.from_bbox_params(:bbox => bbox_string).check_boundaries } exception = assert_raise(OSM::APIBadBoundingBox) { bbox.check_size } assert_equal(@size_error_message, exception.message) end diff --git a/test/models/changeset_test.rb b/test/models/changeset_test.rb index a5176fa8b..cdb1a8e85 100644 --- a/test/models/changeset_test.rb +++ b/test/models/changeset_test.rb @@ -64,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 = "" - 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 diff --git a/test/models/node_test.rb b/test/models/node_test.rb index 6c4717654..a68be4aa9 100644 --- a/test/models/node_test.rb +++ b/test/models/node_test.rb @@ -166,7 +166,7 @@ class NodeTest < ActiveSupport::TestCase version = 1 noid = "" # First try a create which doesn't need the id - assert_nothing_raised(OSM::APIBadXMLError) do + assert_nothing_raised do Node.from_xml(noid, true) end # Now try an update with no id, and make sure that it gives the appropriate exception @@ -214,7 +214,7 @@ class NodeTest < ActiveSupport::TestCase def test_from_xml_no_version no_version = "" - assert_nothing_raised(OSM::APIBadXMLError) do + assert_nothing_raised do Node.from_xml(no_version, true) end message_update = assert_raise(OSM::APIBadXMLError) do @@ -239,7 +239,7 @@ class NodeTest < ActiveSupport::TestCase id_list = ["", "0", "00", "0.0", "a"] id_list.each do |id| zero_id = "" - assert_nothing_raised(OSM::APIBadUserInput) do + assert_nothing_raised do Node.from_xml(zero_id, true) end message_update = assert_raise(OSM::APIBadUserInput) do diff --git a/test/models/redaction_test.rb b/test/models/redaction_test.rb index 2e629867b..4196dea15 100644 --- a/test/models/redaction_test.rb +++ b/test/models/redaction_test.rb @@ -28,7 +28,7 @@ class RedactionTest < ActiveSupport::TestCase r = create(:redaction) assert_equal(false, node_v1.redacted?, "Expected node to not be redacted already.") - assert_nothing_raised(OSM::APICannotRedactError) do + assert_nothing_raised do node_v1.redact!(r) end assert_equal(true, node_v1.redacted?, "Expected node version 1 to be redacted after redact! call.") diff --git a/test/models/relation_test.rb b/test/models/relation_test.rb index d422738bf..b06cbd9b8 100644 --- a/test/models/relation_test.rb +++ b/test/models/relation_test.rb @@ -3,7 +3,7 @@ require "test_helper" class RelationTest < ActiveSupport::TestCase def test_from_xml_no_id noid = "" - assert_nothing_raised(OSM::APIBadXMLError) do + assert_nothing_raised do Relation.from_xml(noid, true) end message = assert_raise(OSM::APIBadXMLError) do @@ -26,7 +26,7 @@ class RelationTest < ActiveSupport::TestCase def test_from_xml_no_version no_version = "" - assert_nothing_raised(OSM::APIBadXMLError) do + assert_nothing_raised do Relation.from_xml(no_version, true) end message_update = assert_raise(OSM::APIBadXMLError) do @@ -39,7 +39,7 @@ class RelationTest < ActiveSupport::TestCase id_list = ["", "0", "00", "0.0", "a"] id_list.each do |id| zero_id = "" - assert_nothing_raised(OSM::APIBadUserInput) do + assert_nothing_raised do Relation.from_xml(zero_id, true) end message_update = assert_raise(OSM::APIBadUserInput) do diff --git a/test/models/way_test.rb b/test/models/way_test.rb index 4519ebba8..6abf99c57 100644 --- a/test/models/way_test.rb +++ b/test/models/way_test.rb @@ -42,7 +42,7 @@ 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 @@ -65,7 +65,7 @@ class WayTest < ActiveSupport::TestCase 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 @@ -78,7 +78,7 @@ class WayTest < ActiveSupport::TestCase 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 -- 2.43.2