X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/06cca3717a91dcc089205bda5aab30c0f10ba582..03ebd2ac5e8048fcf7c5dea1cbdde6d90f606402:/test/controllers/api/old_nodes_controller_test.rb

diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb
index 04e76dac5..fb1ee16bc 100644
--- a/test/controllers/api/old_nodes_controller_test.rb
+++ b/test/controllers/api/old_nodes_controller_test.rb
@@ -197,16 +197,14 @@ module Api
     # test the redaction of an old version of a node, while not being
     # authorised.
     def test_redact_node_unauthorised
-      do_redact_redactable_node
-      assert_response :unauthorized, "should need to be authenticated to redact."
-    end
+      node = create(:node, :with_history, :version => 2)
+      old_node = node.old_nodes.find_by(:version => 1)
+      redaction = create(:redaction)
 
-    ##
-    # test the redaction of an old version of a node, while being
-    # authorised as a normal user.
-    def test_redact_node_normal_user
-      do_redact_redactable_node bearer_authorization_header
-      assert_response :forbidden, "should need to be moderator to redact."
+      post node_version_redact_path(*old_node.id), :params => { :redaction => redaction.id }
+
+      assert_response :unauthorized, "should need to be authenticated to redact."
+      assert_nil old_node.reload.redaction
     end
 
     ##
@@ -214,53 +212,62 @@ module Api
     # can't be redacted.
     def test_redact_node_current_version
       node = create(:node, :with_history, :version => 2)
+      old_node = node.old_nodes.find_by(:version => 2)
       redaction = create(:redaction)
       auth_header = bearer_authorization_header create(:moderator_user)
 
-      post node_version_redact_path(node, 2), :params => { :redaction => redaction.id }, :headers => auth_header
+      post node_version_redact_path(*old_node.id), :params => { :redaction => redaction.id }, :headers => auth_header
 
       assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
+      assert_nil old_node.reload.redaction
     end
 
     def test_redact_node_by_regular_without_write_redactions_scope
+      node = create(:node, :with_history, :version => 2)
+      old_node = node.old_nodes.find_by(:version => 1)
+      redaction = create(:redaction)
       auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs write_api])
-      do_redact_redactable_node(auth_header)
+
+      post node_version_redact_path(*old_node.id), :params => { :redaction => redaction.id }, :headers => auth_header
+
       assert_response :forbidden, "should need to be moderator to redact."
+      assert_nil old_node.reload.redaction
     end
 
     def test_redact_node_by_regular_with_write_redactions_scope
+      node = create(:node, :with_history, :version => 2)
+      old_node = node.old_nodes.find_by(:version => 1)
+      redaction = create(:redaction)
       auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_redactions])
-      do_redact_redactable_node(auth_header)
+
+      post node_version_redact_path(*old_node.id), :params => { :redaction => redaction.id }, :headers => auth_header
+
       assert_response :forbidden, "should need to be moderator to redact."
+      assert_nil old_node.reload.redaction
     end
 
     def test_redact_node_by_moderator_without_write_redactions_scope
+      node = create(:node, :with_history, :version => 2)
+      old_node = node.old_nodes.find_by(:version => 1)
+      redaction = create(:redaction)
       auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs write_api])
-      do_redact_redactable_node(auth_header)
+
+      post node_version_redact_path(*old_node.id), :params => { :redaction => redaction.id }, :headers => auth_header
+
       assert_response :forbidden, "should need to have write_redactions scope to redact."
+      assert_nil old_node.reload.redaction
     end
 
     def test_redact_node_by_moderator_with_write_redactions_scope
-      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_redactions])
-      do_redact_redactable_node(auth_header)
-      assert_response :success, "should be OK to redact old version as moderator with write_redactions scope."
-    end
-
-    ##
-    # test the redaction of an old version of a node, while being
-    # authorised as a moderator.
-    def test_redact_node_moderator
       node = create(:node, :with_history, :version => 2)
       old_node = node.old_nodes.find_by(:version => 1)
       redaction = create(:redaction)
-      auth_header = bearer_authorization_header create(:moderator_user)
+      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_redactions])
 
       post node_version_redact_path(*old_node.id), :params => { :redaction => redaction.id }, :headers => auth_header
 
-      assert_response :success, "should be OK to redact old version as moderator."
-      old_node.reload
-      assert_predicate old_node, :redacted?
-      assert_equal redaction, old_node.redaction
+      assert_response :success, "should be OK to redact old version as moderator with write_redactions scope."
+      assert_equal redaction, old_node.reload.redaction
     end
 
     ##
@@ -313,13 +320,6 @@ module Api
 
     private
 
-    def do_redact_redactable_node(headers = {})
-      node = create(:node, :with_history, :version => 2)
-      redaction = create(:redaction)
-
-      post node_version_redact_path(node, 1), :params => { :redaction => redaction.id }, :headers => headers
-    end
-
     def check_not_found_id_version(id, version)
       get api_node_version_path(id, version)
       assert_response :not_found