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

[rails.git] / 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 64325fd28c5e4a7e3e4cba4a4301832864942d32..8ce19f3ea2f5f80669801e34fc3d9115d5f0181c 100644 (file)
--- a/test/controllers/api/old_nodes_controller_test.rb
+++ b/test/controllers/api/old_nodes_controller_test.rb
@@ -238,14 +238,8 @@ module Api
       assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
     end
 
       assert_response :bad_request, "shouldn't be OK to redact current version as moderator."
     end
 

-    def test_redact_node_by_regular_with_read_prefs_scope
-      auth_header = bearer_authorization_header(create(:user), :scopes => %w[read_prefs])
-      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_api_scope
-      auth_header = bearer_authorization_header(create(:user), :scopes => %w[write_api])
+    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
       do_redact_redactable_node(auth_header)
       assert_response :forbidden, "should need to be moderator to redact."
     end


@@ -256,19 +250,12 @@ module Api
       assert_response :forbidden, "should need to be moderator to redact."
     end
 
       assert_response :forbidden, "should need to be moderator to redact."
     end
 

-    def test_redact_node_by_moderator_with_read_prefs_scope
-      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[read_prefs])
+    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
 
       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_api_scope
-      auth_header = bearer_authorization_header(create(:moderator_user), :scopes => %w[write_api])
-      do_redact_redactable_node(auth_header)
-      assert_response :success, "should be OK to redact old version as moderator with write_api scope."
-      # 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)
     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)