Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"

This reverts merge request !26823

8 files changed, 0 insertions, 177 deletions

diff --git a/spec/controllers/groups/avatars_controller_spec.rb b/spec/controllers/groups/avatars_controller_spec.rb
index 6ececa6f372..772d1d0c1dd 100644
--- a/spec/controllers/groups/avatars_controller_spec.rb
+++ b/spec/controllers/groups/avatars_controller_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Groups::AvatarsController do
-  include ExternalAuthorizationServiceHelpers
-
   let(:user)  { create(:user) }
   let(:group) { create(:group, avatar: fixture_file_upload("spec/fixtures/dk.png", "image/png")) }
 
@@ -17,12 +15,4 @@ describe Groups::AvatarsController do
     expect(@group.avatar.present?).to be_falsey
     expect(@group).to be_valid
   end
-
-  it 'works when external authorization service is enabled' do
-    enable_external_authorization_service_check
-
-    delete :destroy, params: { group_id: group }
-
-    expect(response).to have_gitlab_http_status(302)
-  end
 end
diff --git a/spec/controllers/groups/boards_controller_spec.rb b/spec/controllers/groups/boards_controller_spec.rb
index 0ca5ce51750..27ee37b3817 100644
--- a/spec/controllers/groups/boards_controller_spec.rb
+++ b/spec/controllers/groups/boards_controller_spec.rb
@@ -82,10 +82,6 @@ describe Groups::BoardsController do
       end
     end
 
-    it_behaves_like 'disabled when using an external authorization service' do
-      subject { list_boards }
-    end
-
     def list_boards(format: :html)
       get :index, params: { group_id: group }, format: format
     end
@@ -164,10 +160,6 @@ describe Groups::BoardsController do
       end
     end
 
-    it_behaves_like 'disabled when using an external authorization service' do
-      subject { read_board board: board }
-    end
-
     def read_board(board:, format: :html)
       get :show, params: {
                    group_id: group,
diff --git a/spec/controllers/groups/children_controller_spec.rb b/spec/controllers/groups/children_controller_spec.rb
index 4085c8f95a9..e1b97013408 100644
--- a/spec/controllers/groups/children_controller_spec.rb
+++ b/spec/controllers/groups/children_controller_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Groups::ChildrenController do
-  include ExternalAuthorizationServiceHelpers
-
   let(:group) { create(:group, :public) }
   let(:user) { create(:user) }
   let!(:group_member) { create(:group_member, group: group, user: user) }
@@ -319,15 +317,5 @@ describe Groups::ChildrenController do
         end
       end
     end
-
-    context 'external authorization' do
-      it 'works when external authorization service is enabled' do
-        enable_external_authorization_service_check
-
-        get :index, params: { group_id: group }, format: :json
-
-        expect(response).to have_gitlab_http_status(200)
-      end
-    end
   end
 end
diff --git a/spec/controllers/groups/group_members_controller_spec.rb b/spec/controllers/groups/group_members_controller_spec.rb
index 96a58d6d87c..3a801fabafc 100644
--- a/spec/controllers/groups/group_members_controller_spec.rb
+++ b/spec/controllers/groups/group_members_controller_spec.rb
@@ -1,11 +1,8 @@
 require 'spec_helper'
 
 describe Groups::GroupMembersController do
-  include ExternalAuthorizationServiceHelpers
-
   let(:user)  { create(:user) }
   let(:group) { create(:group, :public, :access_requestable) }
-  let(:membership) { create(:group_member, group: group) }
 
   describe 'GET index' do
     it 'renders index with 200 status code' do
@@ -266,87 +263,4 @@ describe Groups::GroupMembersController do
       end
     end
   end
-
-  context 'with external authorization enabled' do
-    before do
-      enable_external_authorization_service_check
-      group.add_owner(user)
-      sign_in(user)
-    end
-
-    describe 'GET #index' do
-      it 'is successful' do
-        get :index, params: { group_id: group }
-
-        expect(response).to have_gitlab_http_status(200)
-      end
-    end
-
-    describe 'POST #create' do
-      it 'is successful' do
-        post :create, params: { group_id: group, users: user, access_level: Gitlab::Access::GUEST }
-
-        expect(response).to have_gitlab_http_status(302)
-      end
-    end
-
-    describe 'PUT #update' do
-      it 'is successful' do
-        put :update,
-            params: {
-              group_member: { access_level: Gitlab::Access::GUEST },
-              group_id: group,
-              id: membership
-            },
-            format: :js
-
-        expect(response).to have_gitlab_http_status(200)
-      end
-    end
-
-    describe 'DELETE #destroy' do
-      it 'is successful' do
-        delete :destroy, params: { group_id: group, id: membership }
-
-        expect(response).to have_gitlab_http_status(302)
-      end
-    end
-
-    describe 'POST #destroy' do
-      it 'is successful' do
-        sign_in(create(:user))
-
-        post :request_access, params: { group_id: group }
-
-        expect(response).to have_gitlab_http_status(302)
-      end
-    end
-
-    describe 'POST #approve_request_access' do
-      it 'is successful' do
-        access_request = create(:group_member, :access_request, group: group)
-        post :approve_access_request, params: { group_id: group, id: access_request }
-
-        expect(response).to have_gitlab_http_status(302)
-      end
-    end
-
-    describe 'DELETE #leave' do
-      it 'is successful' do
-        group.add_owner(create(:user))
-
-        delete :leave, params: { group_id: group }
-
-        expect(response).to have_gitlab_http_status(302)
-      end
-    end
-
-    describe 'POST #resend_invite' do
-      it 'is successful' do
-        post :resend_invite, params: { group_id: group, id: membership }
-
-        expect(response).to have_gitlab_http_status(302)
-      end
-    end
-  end
 end
diff --git a/spec/controllers/groups/labels_controller_spec.rb b/spec/controllers/groups/labels_controller_spec.rb
index 9af47114838..fa664a29066 100644
--- a/spec/controllers/groups/labels_controller_spec.rb
+++ b/spec/controllers/groups/labels_controller_spec.rb
@@ -37,12 +37,6 @@ describe Groups::LabelsController do
         expect(label_ids).to match_array([group_label_1.title, subgroup_label_1.title])
       end
     end
-
-    context 'external authorization' do
-      subject { get :index, params: { group_id: group.to_param } }
-
-      it_behaves_like 'disabled when using an external authorization service'
-    end
   end
 
   describe 'POST #toggle_subscription' do
diff --git a/spec/controllers/groups/milestones_controller_spec.rb b/spec/controllers/groups/milestones_controller_spec.rb
index d70946cbc8f..043cf28514b 100644
--- a/spec/controllers/groups/milestones_controller_spec.rb
+++ b/spec/controllers/groups/milestones_controller_spec.rb
@@ -80,12 +80,6 @@ describe Groups::MilestonesController do
         expect(response.content_type).to eq 'application/json'
       end
     end
-
-    context 'external authorization' do
-      subject { get :index, params: { group_id: group.to_param } }
-
-      it_behaves_like 'disabled when using an external authorization service'
-    end
   end
 
   describe '#show' do
diff --git a/spec/controllers/groups/settings/ci_cd_controller_spec.rb b/spec/controllers/groups/settings/ci_cd_controller_spec.rb
index b998f64ef72..3290ed8b088 100644
--- a/spec/controllers/groups/settings/ci_cd_controller_spec.rb
+++ b/spec/controllers/groups/settings/ci_cd_controller_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Groups::Settings::CiCdController do
-  include ExternalAuthorizationServiceHelpers
-
   let(:group) { create(:group) }
   let(:user) { create(:user) }
 
@@ -35,19 +33,6 @@ describe Groups::Settings::CiCdController do
         expect(response).to have_gitlab_http_status(404)
       end
     end
-
-    context 'external authorization' do
-      before do
-        enable_external_authorization_service_check
-        group.add_owner(user)
-      end
-
-      it 'renders show with 200 status code' do
-        get :show, params: { group_id: group }
-
-        expect(response).to have_gitlab_http_status(200)
-      end
-    end
   end
 
   describe 'PUT #reset_registration_token' do
diff --git a/spec/controllers/groups/variables_controller_spec.rb b/spec/controllers/groups/variables_controller_spec.rb
index 40f05167350..29ec3588316 100644
--- a/spec/controllers/groups/variables_controller_spec.rb
+++ b/spec/controllers/groups/variables_controller_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Groups::VariablesController do
-  include ExternalAuthorizationServiceHelpers
-
   let(:group) { create(:group) }
   let(:user) { create(:user) }
 
@@ -36,36 +34,4 @@ describe Groups::VariablesController do
 
     include_examples 'PATCH #update updates variables'
   end
-
-  context 'with external authorization enabled' do
-    before do
-      enable_external_authorization_service_check
-    end
-
-    describe 'GET #show' do
-      let!(:variable) { create(:ci_group_variable, group: group) }
-
-      it 'is successful' do
-        get :show, params: { group_id: group }, format: :json
-
-        expect(response).to have_gitlab_http_status(200)
-      end
-    end
-
-    describe 'PATCH #update' do
-      let!(:variable) { create(:ci_group_variable, group: group) }
-      let(:owner) { group }
-
-      it 'is successful' do
-        patch :update,
-              params: {
-                group_id: group,
-                variables_attributes: [{ id: variable.id, key: 'hello' }]
-              },
-              format: :json
-
-        expect(response).to have_gitlab_http_status(200)
-      end
-    end
-  end
 end