X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0063727434d240528d72cbeabae9cb4d46cd6b15..c3dc1b77704d5a12213a92f1ae57cc707756155d:/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 0f7227287..312bae5dd 100644
--- a/test/controllers/api/old_nodes_controller_test.rb
+++ b/test/controllers/api/old_nodes_controller_test.rb
@@ -21,10 +21,6 @@ module Api
         { :path => "/api/0.6/node/1/2.json", :method => :get },
         { :controller => "api/old_nodes", :action => "show", :node_id => "1", :version => "2", :format => "json" }
       )
-      assert_routing(
-        { :path => "/api/0.6/node/1/2/redact", :method => :post },
-        { :controller => "api/old_nodes", :action => "redact", :node_id => "1", :version => "2" }
-      )
     end
 
     def test_index
@@ -193,133 +189,8 @@ 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)
-      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
-
-      assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
-    end
-
-    def test_redact_node_by_regular_without_write_redactions_scope
-      auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs write_api])
-      do_redact_redactable_node(auth_header)
-      assert_response :forbidden, "should need to be moderator to redact."
-    end
-
-    def test_redact_node_by_regular_with_write_redactions_scope
-      auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_redactions])
-      do_redact_redactable_node(auth_header)
-      assert_response :forbidden, "should need to be moderator to redact."
-    end
-
-    def test_redact_node_by_moderator_without_write_redactions_scope
-      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs write_api])
-      do_redact_redactable_node(auth_header)
-      assert_response :forbidden, "should need to have write_redactions scope to redact."
-    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)
-      redaction = create(:redaction)
-      auth_header = bearer_authorization_header create(:moderator_user)
-
-      post node_version_redact_path(*node_v1.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
-    end
-
-    ##
-    # test the unredaction of an old version of a node, while not being
-    # authorised.
-    def test_unredact_node_unauthorised
-      node = create(:node, :with_history, :version => 2)
-      node_v1 = node.old_nodes.find_by(:version => 1)
-      redaction = create(:redaction)
-      node_v1.redact!(redaction)
-
-      post node_version_redact_path(node_v1.node_id, node_v1.version)
-
-      assert_response :unauthorized, "should need to be authenticated to unredact."
-      assert_equal redaction, node_v1.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)
-      redaction = create(:redaction)
-      node_v1.redact!(redaction)
-      auth_header = bearer_authorization_header user
-
-      post node_version_redact_path(node_v1.node_id, node_v1.version), :headers => auth_header
-
-      assert_response :forbidden, "should need to be moderator to unredact."
-      assert_equal redaction, node_v1.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
-
-      post node_version_redact_path(node_v1.node_id, node_v1.version), :headers => auth_header
-
-      assert_response :success, "should be OK to unredact old version as moderator."
-      assert_nil node_v1.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