Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 3 insertions, 13 deletions

diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index aec629ba330..357044a144c 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -190,20 +190,10 @@ RSpec.describe ApplicationController do
       expect(response).to redirect_to new_user_session_path
     end
 
-    context 'request format is unknown' do
-      it 'redirects if unauthenticated' do
-        get :index, format: 'unknown'
+    it 'redirects if unauthenticated and request format is unknown' do
+      get :index, format: 'unknown'
 
-        expect(response).to redirect_to new_user_session_path
-      end
-
-      it 'returns a 401 if the feature flag is disabled' do
-        stub_feature_flags(devise_redirect_unknown_formats: false)
-
-        get :index, format: 'unknown'
-
-        expect(response).to have_gitlab_http_status(:unauthorized)
-      end
+      expect(response).to redirect_to new_user_session_path
     end
   end