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

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

diff --git a/test/models/redaction_test.rb b/test/models/redaction_test.rb
index 7ea3e458d1138dc2d52dc66a591f383b0255dbf7..fb232b81b4396ef4bc3f6ae0aef27f10980d34f9 100644 (file)
--- a/test/models/redaction_test.rb
+++ b/test/models/redaction_test.rb
@@ -1,5 +1,4 @@
 require "test_helper"
 require "test_helper"

-require "osm"

 
 class RedactionTest < ActiveSupport::TestCase
   def test_cannot_redact_current
 
 class RedactionTest < ActiveSupport::TestCase
   def test_cannot_redact_current


@@ -12,8 +11,8 @@ class RedactionTest < ActiveSupport::TestCase
   end
 
   def test_cannot_redact_current_via_old
   end
 
   def test_cannot_redact_current_via_old

-    node = create(:node)
-    node_v1 = create(:old_node, :node_id => node.id)
+    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_raise(OSM::APICannotRedactError) do
     r = create(:redaction)
     assert_equal(false, node_v1.redacted?, "Expected node to not be redacted already.")
     assert_raise(OSM::APICannotRedactError) do


@@ -22,13 +21,13 @@ class RedactionTest < ActiveSupport::TestCase
   end
 
   def test_can_redact_old
   end
 
   def test_can_redact_old

-    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)
+    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_equal(false, node_v1.redacted?, "Expected node to not be redacted already.")
     r = create(:redaction)
 
     assert_equal(false, node_v1.redacted?, "Expected node to not be redacted already.")

-    assert_nothing_raised(OSM::APICannotRedactError) do
+    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.")
       node_v1.redact!(r)
     end
     assert_equal(true, node_v1.redacted?, "Expected node version 1 to be redacted after redact! call.")