X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0063727434d240528d72cbeabae9cb4d46cd6b15..f5af8befa9ffe0c95f4a3c58d2fbb63a2e971ab0:/test/controllers/api/old_nodes_controller_test.rb?ds=sidebyside

diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb
index 0f7227287..0c5faa9f9 100644
--- a/test/controllers/api/old_nodes_controller_test.rb
+++ b/test/controllers/api/old_nodes_controller_test.rb
@@ -193,74 +193,81 @@ module Api
       assert_match(/lon="0.0000800"/, response.body)
     end
 
-    ##
-    # 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
-
-    ##
-    # 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."
-    end
-
     ##
     # test that, even as moderator, the current version of a node
     # 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
+
+    ##
+    # test the redaction of an old version of a node, while not being
+    # authorised.
+    def test_redact_node_unauthorised
+      node = create(:node, :with_history, :version => 2)
+      old_node = node.old_nodes.find_by(:version => 1)
+      redaction = create(:redaction)
+
+      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
 
     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)
-      node_v1 = node.old_nodes.find_by(:version => 1)
+      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(*node_v1.id), :params => { :redaction => redaction.id }, :headers => auth_header
+      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."
-      node_v1.reload
-      assert_predicate node_v1, :redacted?
-      assert_equal redaction, node_v1.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
 
     ##
@@ -268,58 +275,49 @@ module Api
     # authorised.
     def test_unredact_node_unauthorised
       node = create(:node, :with_history, :version => 2)
-      node_v1 = node.old_nodes.find_by(:version => 1)
+      old_node = node.old_nodes.find_by(:version => 1)
       redaction = create(:redaction)
-      node_v1.redact!(redaction)
+      old_node.redact!(redaction)
 
-      post node_version_redact_path(node_v1.node_id, node_v1.version)
+      post node_version_redact_path(*old_node.id)
 
       assert_response :unauthorized, "should need to be authenticated to unredact."
-      assert_equal redaction, node_v1.reload.redaction
+      assert_equal redaction, old_node.reload.redaction
     end
 
     ##
     # test the unredaction of an old version of a node, while being
     # authorised as a normal user.
     def test_unredact_node_normal_user
-      user = create(:user)
       node = create(:node, :with_history, :version => 2)
-      node_v1 = node.old_nodes.find_by(:version => 1)
+      old_node = node.old_nodes.find_by(:version => 1)
       redaction = create(:redaction)
-      node_v1.redact!(redaction)
-      auth_header = bearer_authorization_header user
+      old_node.redact!(redaction)
+      auth_header = bearer_authorization_header
 
-      post node_version_redact_path(node_v1.node_id, node_v1.version), :headers => auth_header
+      post node_version_redact_path(*old_node.id), :headers => auth_header
 
       assert_response :forbidden, "should need to be moderator to unredact."
-      assert_equal redaction, node_v1.reload.redaction
+      assert_equal redaction, old_node.reload.redaction
     end
 
     ##
     # test the unredaction of an old version of a node, while being
     # authorised as a moderator.
     def test_unredact_node_moderator
-      moderator_user = create(:moderator_user)
       node = create(:node, :with_history, :version => 2)
-      node_v1 = node.old_nodes.find_by(:version => 1)
-      node_v1.redact!(create(:redaction))
-      auth_header = bearer_authorization_header moderator_user
+      old_node = node.old_nodes.find_by(:version => 1)
+      old_node.redact!(create(:redaction))
+      auth_header = bearer_authorization_header create(:moderator_user)
 
-      post node_version_redact_path(node_v1.node_id, node_v1.version), :headers => auth_header
+      post node_version_redact_path(*old_node.id), :headers => auth_header
 
       assert_response :success, "should be OK to unredact old version as moderator."
-      assert_nil node_v1.reload.redaction
+      assert_nil old_node.reload.redaction
     end
 
     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