X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7a1615bc55aee72dd03a5dd43c08b4f13f669f06..2dfe6f3f2e911101f4e4e3b90a00e2ae97725d04:/test/models/redaction_test.rb diff --git a/test/models/redaction_test.rb b/test/models/redaction_test.rb index d74a91179..00133f1f4 100644 --- a/test/models/redaction_test.rb +++ b/test/models/redaction_test.rb @@ -4,7 +4,7 @@ class RedactionTest < ActiveSupport::TestCase def test_cannot_redact_current n = create(:node) r = create(:redaction) - assert_not(n.redacted?, "Expected node to not be redacted already.") + assert_not_predicate(n, :redacted?, "Expected node to not be redacted already.") assert_raise(OSM::APICannotRedactError) do n.redact!(r) end @@ -14,7 +14,7 @@ class RedactionTest < ActiveSupport::TestCase node = create(:node, :with_history) node_v1 = node.old_nodes.find_by(:version => 1) r = create(:redaction) - assert_not(node_v1.redacted?, "Expected node to not be redacted already.") + assert_not_predicate(node_v1, :redacted?, "Expected node to not be redacted already.") assert_raise(OSM::APICannotRedactError) do node_v1.redact!(r) end @@ -26,11 +26,11 @@ class RedactionTest < ActiveSupport::TestCase node_v2 = node.old_nodes.find_by(:version => 2) r = create(:redaction) - assert_not(node_v1.redacted?, "Expected node to not be redacted already.") + assert_not_predicate(node_v1, :redacted?, "Expected node to not be redacted already.") assert_nothing_raised do node_v1.redact!(r) end - assert(node_v1.redacted?, "Expected node version 1 to be redacted after redact! call.") - assert_not(node_v2.redacted?, "Expected node version 2 to not be redacted after redact! call.") + assert_predicate(node_v1, :redacted?, "Expected node version 1 to be redacted after redact! call.") + assert_not_predicate(node_v2, :redacted?, "Expected node version 2 to not be redacted after redact! call.") end end