Merge remote-tracking branch 'upstream/pull/3523'

[rails.git] / test / models / redaction_test.rb

diff --git a/test/models/redaction_test.rb b/test/models/redaction_test.rb
index 4196dea154d242cd675150748907f0f3c9786c30..06159cb5d79540280f3a62d53fed1b1b0d74da9c 100644 (file)
--- a/test/models/redaction_test.rb
+++ b/test/models/redaction_test.rb
@@ -1,11 +1,10 @@
 require "test_helper"
 require "test_helper"

-require "osm"

 
 class RedactionTest < ActiveSupport::TestCase
   def test_cannot_redact_current
     n = create(:node)
     r = create(:redaction)
 
 class RedactionTest < ActiveSupport::TestCase
   def test_cannot_redact_current
     n = create(:node)
     r = create(:redaction)

-    assert_equal(false, n.redacted?, "Expected node to not be redacted already.")
+    assert_not(n.redacted?, "Expected node to not be redacted already.")

     assert_raise(OSM::APICannotRedactError) do
       n.redact!(r)
     end
     assert_raise(OSM::APICannotRedactError) do
       n.redact!(r)
     end


@@ -15,7 +14,7 @@ class RedactionTest < ActiveSupport::TestCase
     node = create(:node, :with_history)
     node_v1 = node.old_nodes.find_by(:version => 1)
     r = create(:redaction)
     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_not(node_v1.redacted?, "Expected node to not be redacted already.")

     assert_raise(OSM::APICannotRedactError) do
       node_v1.redact!(r)
     end
     assert_raise(OSM::APICannotRedactError) do
       node_v1.redact!(r)
     end


@@ -27,11 +26,11 @@ class RedactionTest < ActiveSupport::TestCase
     node_v2 = node.old_nodes.find_by(:version => 2)
     r = create(:redaction)
 
     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_not(node_v1.redacted?, "Expected node to not be redacted already.")

     assert_nothing_raised do
       node_v1.redact!(r)
     end
     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.")
-    assert_equal(false, 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(node_v2.redacted?, "Expected node version 2 to not be redacted after redact! call.")

   end
 end
   end
 end