X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/387668a4c6727d8143211a5d828fd5dfacfa25ce..e37c877da51947cb24af4d046fd71a597bf24ba9:/test/models/redaction_test.rb diff --git a/test/models/redaction_test.rb b/test/models/redaction_test.rb index 06159cb5d..4aa37f492 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,23 @@ 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_predicate(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_not_predicate(node_v2, :redacted?, "Expected node version 2 to not be redacted after redact! call.") + end + + def test_invalid_with_empty_title + redaction = build(:redaction, :title => "") + assert_not redaction.valid? + assert_includes redaction.errors.messages[:title], "can't be blank" + end + + def test_invalid_with_empty_description + redaction = build(:redaction, :description => "") + assert_not redaction.valid? + assert_includes redaction.errors.messages[:description], "can't be blank" end end