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

This reverts merge request !26823

5 files changed, 21 insertions, 71 deletions

diff --git a/spec/controllers/dashboard/groups_controller_spec.rb b/spec/controllers/dashboard/groups_controller_spec.rb
index 775b3ca40b2..c8d99f79277 100644
--- a/spec/controllers/dashboard/groups_controller_spec.rb
+++ b/spec/controllers/dashboard/groups_controller_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Dashboard::GroupsController do
-  include ExternalAuthorizationServiceHelpers
-
   let(:user) { create(:user) }
 
   before do
@@ -13,43 +11,33 @@ describe Dashboard::GroupsController do
     expect(described_class).to include(GroupTree)
   end
 
-  describe '#index' do
-    it 'only includes projects the user is a member of' do
-      member_of_group = create(:group)
-      member_of_group.add_developer(user)
-      create(:group, :public)
-
-      get :index
-
-      expect(assigns(:groups)).to contain_exactly(member_of_group)
-    end
+  it 'only includes projects the user is a member of' do
+    member_of_group = create(:group)
+    member_of_group.add_developer(user)
+    create(:group, :public)
 
-    context 'when rendering an expanded hierarchy with public groups you are not a member of', :nested_groups do
-      let!(:top_level_result) { create(:group, name: 'chef-top') }
-      let!(:top_level_a) { create(:group, name: 'top-a') }
-      let!(:sub_level_result_a) { create(:group, name: 'chef-sub-a', parent: top_level_a) }
-      let!(:other_group) { create(:group, name: 'other') }
+    get :index
 
-      before do
-        top_level_result.add_maintainer(user)
-        top_level_a.add_maintainer(user)
-      end
+    expect(assigns(:groups)).to contain_exactly(member_of_group)
+  end
 
-      it 'renders only groups the user is a member of when searching hierarchy correctly' do
-        get :index, params: { filter: 'chef' }, format: :json
+  context 'when rendering an expanded hierarchy with public groups you are not a member of', :nested_groups do
+    let!(:top_level_result) { create(:group, name: 'chef-top') }
+    let!(:top_level_a) { create(:group, name: 'top-a') }
+    let!(:sub_level_result_a) { create(:group, name: 'chef-sub-a', parent: top_level_a) }
+    let!(:other_group) { create(:group, name: 'other') }
 
-        expect(response).to have_gitlab_http_status(200)
-        all_groups = [top_level_result, top_level_a, sub_level_result_a]
-        expect(assigns(:groups)).to contain_exactly(*all_groups)
-      end
+    before do
+      top_level_result.add_maintainer(user)
+      top_level_a.add_maintainer(user)
     end
 
-    it 'works when the external authorization service is enabled' do
-      enable_external_authorization_service_check
-
-      get :index
+    it 'renders only groups the user is a member of when searching hierarchy correctly' do
+      get :index, params: { filter: 'chef' }, format: :json
 
       expect(response).to have_gitlab_http_status(200)
+      all_groups = [top_level_result, top_level_a, sub_level_result_a]
+      expect(assigns(:groups)).to contain_exactly(*all_groups)
     end
   end
 end
diff --git a/spec/controllers/dashboard/labels_controller_spec.rb b/spec/controllers/dashboard/labels_controller_spec.rb
index 01de896f9f4..a3bfb2f3a87 100644
--- a/spec/controllers/dashboard/labels_controller_spec.rb
+++ b/spec/controllers/dashboard/labels_controller_spec.rb
@@ -13,17 +13,13 @@ describe Dashboard::LabelsController do
   describe "#index" do
     let!(:unrelated_label) { create(:label, project: create(:project, :public)) }
 
-    subject { get :index, format: :json }
-
     it 'returns global labels for projects the user has a relationship with' do
-      subject
+      get :index, format: :json
 
       expect(json_response).to be_kind_of(Array)
       expect(json_response.size).to eq(1)
       expect(json_response[0]["id"]).to be_nil
       expect(json_response[0]["title"]).to eq(label.title)
     end
-
-    it_behaves_like 'disabled when using an external authorization service'
   end
 end
diff --git a/spec/controllers/dashboard/milestones_controller_spec.rb b/spec/controllers/dashboard/milestones_controller_spec.rb
index 1614739db05..828de0e7ca5 100644
--- a/spec/controllers/dashboard/milestones_controller_spec.rb
+++ b/spec/controllers/dashboard/milestones_controller_spec.rb
@@ -81,11 +81,5 @@ describe Dashboard::MilestonesController do
       expect(response.body).to include("Open\n<span class=\"badge badge-pill\">2</span>")
       expect(response.body).to include("Closed\n<span class=\"badge badge-pill\">0</span>")
     end
-
-    context 'external authorization' do
-      subject { get :index }
-
-      it_behaves_like 'disabled when using an external authorization service'
-    end
   end
 end
diff --git a/spec/controllers/dashboard/projects_controller_spec.rb b/spec/controllers/dashboard/projects_controller_spec.rb
index c17cb49e460..649441f4917 100644
--- a/spec/controllers/dashboard/projects_controller_spec.rb
+++ b/spec/controllers/dashboard/projects_controller_spec.rb
@@ -1,29 +1,7 @@
 require 'spec_helper'
 
 describe Dashboard::ProjectsController do
-  include ExternalAuthorizationServiceHelpers
-
-  describe '#index' do
-    context 'user not logged in' do
-      it_behaves_like 'authenticates sessionless user', :index, :atom
-    end
-
-    context 'user logged in' do
-      before do
-        sign_in create(:user)
-      end
-
-      context 'external authorization' do
-        it 'works when the external authorization service is enabled' do
-          enable_external_authorization_service_check
-
-          get :index
-
-          expect(response).to have_gitlab_http_status(200)
-        end
-      end
-    end
-  end
+  it_behaves_like 'authenticates sessionless user', :index, :atom
 
   context 'json requests' do
     render_views
diff --git a/spec/controllers/dashboard/todos_controller_spec.rb b/spec/controllers/dashboard/todos_controller_spec.rb
index abbf0b52306..d88beaff0e1 100644
--- a/spec/controllers/dashboard/todos_controller_spec.rb
+++ b/spec/controllers/dashboard/todos_controller_spec.rb
@@ -105,12 +105,6 @@ describe Dashboard::TodosController do
         end
       end
     end
-
-    context 'external authorization' do
-      subject { get :index }
-
-      it_behaves_like 'disabled when using an external authorization service'
-    end
   end
 
   describe 'PATCH #restore' do