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

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

diff --git a/test/models/redaction_test.rb b/test/models/redaction_test.rb
index b30c80c66e52502ec33f8865826bafce7f88723a..06159cb5d79540280f3a62d53fed1b1b0d74da9c 100644 (file)
--- a/test/models/redaction_test.rb
+++ b/test/models/redaction_test.rb
@@ -1,35 +1,36 @@
 require "test_helper"
 require "test_helper"

-require "osm"

 
 class RedactionTest < ActiveSupport::TestCase
 
 class RedactionTest < ActiveSupport::TestCase

-  api_fixtures
-  fixtures :redactions
-

   def test_cannot_redact_current
   def test_cannot_redact_current

-    n = current_nodes(:node_with_versions)
-    r = redactions(:example)
-    assert_equal(false, n.redacted?, "Expected node to not be redacted already.")
+    n = create(:node)
+    r = create(:redaction)
+    assert_not(n.redacted?, "Expected node to not be redacted already.")

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

-    n = nodes(:node_with_versions_v4)
-    r = redactions(:example)
-    assert_equal(false, n.redacted?, "Expected node to not be redacted already.")
+    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_raise(OSM::APICannotRedactError) do
     assert_raise(OSM::APICannotRedactError) do

-      n.redact!(r)
+      node_v1.redact!(r)

     end
   end
 
   def test_can_redact_old
     end
   end
 
   def test_can_redact_old

-    n = nodes(:node_with_versions_v3)
-    r = redactions(:example)
-    assert_equal(false, n.redacted?, "Expected node to not be redacted already.")
-    assert_nothing_raised(OSM::APICannotRedactError) do
-      n.redact!(r)
+    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_not(node_v1.redacted?, "Expected node to not be redacted already.")
+    assert_nothing_raised do
+      node_v1.redact!(r)

     end
     end

-    assert_equal(true, n.redacted?, "Expected node to 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