X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b78bb9f6313f3139ac83784df52bf39a5619d3e7..cb0c185ce6515b1e9465781667886c0543531c4d:/test/models/redaction_test.rb diff --git a/test/models/redaction_test.rb b/test/models/redaction_test.rb index 7ea3e458d..4196dea15 100644 --- a/test/models/redaction_test.rb +++ b/test/models/redaction_test.rb @@ -12,8 +12,8 @@ class RedactionTest < ActiveSupport::TestCase end def test_cannot_redact_current_via_old - node = create(:node) - node_v1 = create(:old_node, :node_id => node.id) + node = create(:node, :with_history) + node_v1 = node.old_nodes.find_by(:version => 1) r = create(:redaction) assert_equal(false, node_v1.redacted?, "Expected node to not be redacted already.") assert_raise(OSM::APICannotRedactError) do @@ -22,13 +22,13 @@ class RedactionTest < ActiveSupport::TestCase end def test_can_redact_old - node = create(:node, :version => 2) - node_v1 = create(:old_node, :node_id => node.id) - node_v2 = create(:old_node, :node_id => node.id, :version => 2) + node = create(:node, :with_history, :version => 2) + node_v1 = node.old_nodes.find_by(:version => 1) + node_v2 = node.old_nodes.find_by(:version => 2) 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.")