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

This reverts merge request !26823

5 files changed, 0 insertions, 60 deletions

diff --git a/spec/finders/issues_finder_spec.rb b/spec/finders/issues_finder_spec.rb
index 4133987a07e..fe53fabe54c 100644
--- a/spec/finders/issues_finder_spec.rb
+++ b/spec/finders/issues_finder_spec.rb
@@ -559,13 +559,6 @@ describe IssuesFinder do
         expect(issues.count).to eq 0
       end
     end
-
-    context 'external authorization' do
-      it_behaves_like 'a finder with external authorization service' do
-        let!(:subject) { create(:issue, project: project) }
-        let(:project_params) { { project_id: project.id } }
-      end
-    end
   end
 
   describe '#row_count', :request_store do
diff --git a/spec/finders/labels_finder_spec.rb b/spec/finders/labels_finder_spec.rb
index 98b4933fef6..3f060ba0553 100644
--- a/spec/finders/labels_finder_spec.rb
+++ b/spec/finders/labels_finder_spec.rb
@@ -226,12 +226,5 @@ describe LabelsFinder do
         expect(finder.execute).to eq [project_label_1]
       end
     end
-
-    context 'external authorization' do
-      it_behaves_like 'a finder with external authorization service' do
-        let!(:subject) { create(:label, project: project) }
-        let(:project_params) { { project_id: project.id } }
-      end
-    end
   end
 end
diff --git a/spec/finders/merge_requests_finder_spec.rb b/spec/finders/merge_requests_finder_spec.rb
index 9d4b9af3ec3..f508b9bdb6f 100644
--- a/spec/finders/merge_requests_finder_spec.rb
+++ b/spec/finders/merge_requests_finder_spec.rb
@@ -253,13 +253,6 @@ describe MergeRequestsFinder do
         expect(finder.row_count).to eq(1)
       end
     end
-
-    context 'external authorization' do
-      it_behaves_like 'a finder with external authorization service' do
-        let!(:subject) { create(:merge_request, source_project: project) }
-        let(:project_params) { { project_id: project.id } }
-      end
-    end
   end
 
   context 'when projects require different access levels for merge requests' do
diff --git a/spec/finders/snippets_finder_spec.rb b/spec/finders/snippets_finder_spec.rb
index d367f9015c7..93287f3e9b8 100644
--- a/spec/finders/snippets_finder_spec.rb
+++ b/spec/finders/snippets_finder_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe SnippetsFinder do
-  include ExternalAuthorizationServiceHelpers
   include Gitlab::Allowable
 
   describe '#initialize' do
@@ -165,35 +164,4 @@ describe SnippetsFinder do
   end
 
   it_behaves_like 'snippet visibility'
-
-  context 'external authorization' do
-    let(:user) { create(:user) }
-    let(:project) { create(:project) }
-    let!(:snippet) { create(:project_snippet, :public, project: project) }
-
-    before do
-      project.add_maintainer(user)
-    end
-
-    it_behaves_like 'a finder with external authorization service' do
-      let!(:subject) { create(:project_snippet, project: project) }
-      let(:project_params) { { project: project } }
-    end
-
-    it 'includes the result if the external service allows access' do
-      external_service_allow_access(user, project)
-
-      results = described_class.new(user, project: project).execute
-
-      expect(results).to contain_exactly(snippet)
-    end
-
-    it 'does not include any results if the external service denies access' do
-      external_service_deny_access(user, project)
-
-      results = described_class.new(user, project: project).execute
-
-      expect(results).to be_empty
-    end
-  end
 end
diff --git a/spec/finders/todos_finder_spec.rb b/spec/finders/todos_finder_spec.rb
index 22318a9946a..d4ed41d54f0 100644
--- a/spec/finders/todos_finder_spec.rb
+++ b/spec/finders/todos_finder_spec.rb
@@ -47,13 +47,6 @@ describe TodosFinder do
           end
         end
       end
-
-      context 'external authorization' do
-        it_behaves_like 'a finder with external authorization service' do
-          let!(:subject) { create(:todo, project: project, user: user) }
-          let(:project_params) { { project_id: project.id } }
-        end
-      end
     end
 
     describe '#sort' do