From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 22 Mar 2017 18:19:16 +0000 (+0000)
Subject: Use node and old_node factories for redaction model tests.
X-Git-Tag: live~3500^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4ed160778492b8a2c5df66ea194233788a815e11

Use node and old_node factories for redaction model tests.
---

diff --git a/test/models/redaction_test.rb b/test/models/redaction_test.rb
index 3cadb8a08..7ea3e458d 100644
--- a/test/models/redaction_test.rb
+++ b/test/models/redaction_test.rb
@@ -2,10 +2,8 @@ require "test_helper"
 require "osm"
 
 class RedactionTest < ActiveSupport::TestCase
-  api_fixtures
-
   def test_cannot_redact_current
-    n = current_nodes(:node_with_versions)
+    n = create(:node)
     r = create(:redaction)
     assert_equal(false, n.redacted?, "Expected node to not be redacted already.")
     assert_raise(OSM::APICannotRedactError) do
@@ -14,21 +12,26 @@ class RedactionTest < ActiveSupport::TestCase
   end
 
   def test_cannot_redact_current_via_old
-    n = nodes(:node_with_versions_v4)
+    node = create(:node)
+    node_v1 = create(:old_node, :node_id => node.id)
     r = create(:redaction)
-    assert_equal(false, n.redacted?, "Expected node to not be redacted already.")
+    assert_equal(false, node_v1.redacted?, "Expected node to not be redacted already.")
     assert_raise(OSM::APICannotRedactError) do
-      n.redact!(r)
+      node_v1.redact!(r)
     end
   end
 
   def test_can_redact_old
-    n = nodes(:node_with_versions_v3)
+    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)
     r = create(:redaction)
-    assert_equal(false, n.redacted?, "Expected node to not be redacted already.")
+
+    assert_equal(false, node_v1.redacted?, "Expected node to not be redacted already.")
     assert_nothing_raised(OSM::APICannotRedactError) do
-      n.redact!(r)
+      node_v1.redact!(r)
     end
-    assert_equal(true, n.redacted?, "Expected node to be redacted after redact! call.")
+    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.")
   end
 end