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

This reverts merge request !26823

7 files changed, 0 insertions, 324 deletions

diff --git a/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb b/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb
deleted file mode 100644
index 4098dd02141..00000000000
--- a/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'spec_helper'
-
-describe 'The group dashboard' do
-  include ExternalAuthorizationServiceHelpers
-
-  let(:user) { create(:user) }
-
-  before do
-    sign_in user
-  end
-
-  describe 'The top navigation' do
-    it 'has all the expected links' do
-      visit dashboard_groups_path
-
-      within('.navbar') do
-        expect(page).to have_button('Projects')
-        expect(page).to have_button('Groups')
-        expect(page).to have_link('Activity')
-        expect(page).to have_link('Milestones')
-        expect(page).to have_link('Snippets')
-      end
-    end
-
-    it 'hides some links when an external authorization service is enabled' do
-      enable_external_authorization_service_check
-      visit dashboard_groups_path
-
-      within('.navbar') do
-        expect(page).to have_button('Projects')
-        expect(page).to have_button('Groups')
-        expect(page).not_to have_link('Activity')
-        expect(page).not_to have_link('Milestones')
-        expect(page).to have_link('Snippets')
-      end
-    end
-  end
-end
diff --git a/spec/features/groups/group_page_with_external_authorization_service_spec.rb b/spec/features/groups/group_page_with_external_authorization_service_spec.rb
deleted file mode 100644
index c05c3f4f3d6..00000000000
--- a/spec/features/groups/group_page_with_external_authorization_service_spec.rb
+++ /dev/null
@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'The group page' do
-  include ExternalAuthorizationServiceHelpers
-
-  let(:user) { create(:user) }
-  let(:group) { create(:group) }
-
-  before do
-    sign_in user
-    group.add_owner(user)
-  end
-
-  def expect_all_sidebar_links
-    within('.nav-sidebar') do
-      expect(page).to have_link('Overview')
-      expect(page).to have_link('Details')
-      expect(page).to have_link('Activity')
-      expect(page).to have_link('Issues')
-      expect(page).to have_link('Merge Requests')
-      expect(page).to have_link('Members')
-    end
-  end
-
-  describe 'The sidebar' do
-    it 'has all the expected links' do
-      visit group_path(group)
-
-      expect_all_sidebar_links
-    end
-
-    it 'shows all project features when policy control is enabled' do
-      stub_application_setting(external_authorization_service_enabled: true)
-
-      visit group_path(group)
-
-      expect_all_sidebar_links
-    end
-
-    it 'hides some links when an external authorization service configured with an url' do
-      enable_external_authorization_service_check
-      visit group_path(group)
-
-      within('.nav-sidebar') do
-        expect(page).to have_link('Overview')
-        expect(page).to have_link('Details')
-        expect(page).not_to have_link('Activity')
-        expect(page).not_to have_link('Contribution Analytics')
-
-        expect(page).not_to have_link('Issues')
-        expect(page).not_to have_link('Merge Requests')
-        expect(page).to have_link('Members')
-      end
-    end
-  end
-end
diff --git a/spec/features/projects/classification_label_on_project_pages_spec.rb b/spec/features/projects/classification_label_on_project_pages_spec.rb
deleted file mode 100644
index 92f8aa8eb8d..00000000000
--- a/spec/features/projects/classification_label_on_project_pages_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'Classification label on project pages' do
-  let(:project) do
-    create(:project, external_authorization_classification_label: 'authorized label')
-  end
-  let(:user) { create(:user) }
-
-  before do
-    stub_application_setting(external_authorization_service_enabled: true)
-    project.add_maintainer(user)
-    sign_in(user)
-  end
-
-  it 'shows the classification label on the project page' do
-    visit project_path(project)
-
-    expect(page).to have_content('authorized label')
-  end
-end
diff --git a/spec/features/projects/forks/fork_list_spec.rb b/spec/features/projects/forks/fork_list_spec.rb
deleted file mode 100644
index 2c41c61a660..00000000000
--- a/spec/features/projects/forks/fork_list_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe 'listing forks of a project' do
-  include ProjectForksHelper
-  include ExternalAuthorizationServiceHelpers
-
-  let(:source) { create(:project, :public, :repository) }
-  let!(:fork) { fork_project(source, nil, repository: true) }
-  let(:user) { create(:user) }
-
-  before do
-    source.add_maintainer(user)
-    sign_in(user)
-  end
-
-  it 'shows the forked project in the list with commit as description' do
-    visit project_forks_path(source)
-
-    page.within('li.project-row') do
-      expect(page).to have_content(fork.full_name)
-      expect(page).to have_css('a.commit-row-message')
-    end
-  end
-
-  it 'does not show the commit message when an external authorization service is used' do
-    enable_external_authorization_service_check
-
-    visit project_forks_path(source)
-
-    page.within('li.project-row') do
-      expect(page).to have_content(fork.full_name)
-      expect(page).not_to have_css('a.commit-row-message')
-    end
-  end
-end
diff --git a/spec/features/projects/issues/viewing_issues_with_external_authorization_enabled_spec.rb b/spec/features/projects/issues/viewing_issues_with_external_authorization_enabled_spec.rb
deleted file mode 100644
index a8612d77a5e..00000000000
--- a/spec/features/projects/issues/viewing_issues_with_external_authorization_enabled_spec.rb
+++ /dev/null
@@ -1,128 +0,0 @@
-require 'spec_helper'
-
-describe 'viewing an issue with cross project references' do
-  include ExternalAuthorizationServiceHelpers
-  include Gitlab::Routing.url_helpers
-
-  let(:user) { create(:user) }
-  let(:other_project) do
-    create(:project, :public,
-          external_authorization_classification_label: 'other_label')
-  end
-  let(:other_issue) do
-    create(:issue, :closed,
-           title: 'I am in another project',
-           project: other_project)
-  end
-  let(:other_confidential_issue) do
-    create(:issue, :confidential, :closed,
-           title: 'I am in another project and confidential',
-           project: other_project)
-  end
-  let(:other_merge_request) do
-    create(:merge_request, :closed,
-           title: 'I am a merge request in another project',
-           source_project: other_project)
-  end
-  let(:description_referencing_other_issue) do
-    "Referencing: #{other_issue.to_reference(project)}, "\
-    "a confidential issue #{confidential_issue.to_reference}, "\
-    "a cross project confidential issue #{other_confidential_issue.to_reference(project)}, and "\
-    "a cross project merge request #{other_merge_request.to_reference(project)}"
-  end
-  let(:project) { create(:project) }
-  let(:issue) do
-    create(:issue,
-           project: project,
-           description: description_referencing_other_issue )
-  end
-  let(:confidential_issue) do
-    create(:issue, :confidential, :closed,
-           title: "I am in the same project and confidential",
-           project: project)
-  end
-
-  before do
-    project.add_developer(user)
-    sign_in(user)
-  end
-
-  it 'shows all information related to the cross project reference' do
-    visit project_issue_path(project, issue)
-
-    expect(page).to have_link("#{other_issue.to_reference(project)} (#{other_issue.state})")
-    expect(page).to have_xpath("//a[@title='#{other_issue.title}']")
-  end
-
-  it 'shows a link to the confidential issue in the same project' do
-    visit project_issue_path(project, issue)
-
-    expect(page).to have_link("#{confidential_issue.to_reference(project)} (#{confidential_issue.state})")
-    expect(page).to have_xpath("//a[@title='#{confidential_issue.title}']")
-  end
-
-  it 'does not show the link to a cross project confidential issue when the user does not have access' do
-    visit project_issue_path(project, issue)
-
-    expect(page).not_to have_link("#{other_confidential_issue.to_reference(project)} (#{other_confidential_issue.state})")
-    expect(page).not_to have_xpath("//a[@title='#{other_confidential_issue.title}']")
-  end
-
-  it 'shows the link to a cross project confidential issue when the user has access' do
-    other_project.add_developer(user)
-
-    visit project_issue_path(project, issue)
-
-    expect(page).to have_link("#{other_confidential_issue.to_reference(project)} (#{other_confidential_issue.state})")
-    expect(page).to have_xpath("//a[@title='#{other_confidential_issue.title}']")
-  end
-
-  context 'when an external authorization service is enabled' do
-    before do
-      enable_external_authorization_service_check
-    end
-
-    it 'only hits the external service for the project the user is viewing' do
-      expect(::Gitlab::ExternalAuthorization)
-        .to receive(:access_allowed?).with(user, 'default_label', any_args).at_least(1).and_return(true)
-      expect(::Gitlab::ExternalAuthorization)
-        .not_to receive(:access_allowed?).with(user, 'other_label', any_args)
-
-      visit project_issue_path(project, issue)
-    end
-
-    it 'shows only the link to the cross project references' do
-      visit project_issue_path(project, issue)
-
-      expect(page).to have_link("#{other_issue.to_reference(project)}")
-      expect(page).to have_link("#{other_merge_request.to_reference(project)}")
-      expect(page).not_to have_content("#{other_issue.to_reference(project)} (#{other_issue.state})")
-      expect(page).not_to have_xpath("//a[@title='#{other_issue.title}']")
-      expect(page).not_to have_content("#{other_merge_request.to_reference(project)} (#{other_merge_request.state})")
-      expect(page).not_to have_xpath("//a[@title='#{other_merge_request.title}']")
-    end
-
-    it 'does not link a cross project confidential issue if the user does not have access' do
-      visit project_issue_path(project, issue)
-
-      expect(page).not_to have_link("#{other_confidential_issue.to_reference(project)}")
-      expect(page).not_to have_xpath("//a[@title='#{other_confidential_issue.title}']")
-    end
-
-    it 'links a cross project confidential issue without exposing information when the user has access' do
-      other_project.add_developer(user)
-
-      visit project_issue_path(project, issue)
-
-      expect(page).to have_link("#{other_confidential_issue.to_reference(project)}")
-      expect(page).not_to have_xpath("//a[@title='#{other_confidential_issue.title}']")
-    end
-
-    it 'shows a link to the confidential issue in the same project' do
-      visit project_issue_path(project, issue)
-
-      expect(page).to have_link("#{confidential_issue.to_reference(project)} (#{confidential_issue.state})")
-      expect(page).to have_xpath("//a[@title='#{confidential_issue.title}']")
-    end
-  end
-end
diff --git a/spec/features/projects/settings/external_authorization_service_settings_spec.rb b/spec/features/projects/settings/external_authorization_service_settings_spec.rb
deleted file mode 100644
index 31b2892cf6f..00000000000
--- a/spec/features/projects/settings/external_authorization_service_settings_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'Projects > Settings > External Authorization Classification Label setting' do
-  let(:user) { create(:user) }
-  let(:project) { create(:project_empty_repo) }
-
-  before do
-    project.add_maintainer(user)
-    sign_in(user)
-  end
-
-  it 'shows the field to set a classification label' do
-    stub_application_setting(external_authorization_service_enabled: true)
-
-    visit edit_project_path(project)
-
-    expect(page).to have_selector('#project_external_authorization_classification_label')
-  end
-end
diff --git a/spec/features/users/show_spec.rb b/spec/features/users/show_spec.rb
index 351750c0179..86379164cf0 100644
--- a/spec/features/users/show_spec.rb
+++ b/spec/features/users/show_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe 'User page' do
-  include ExternalAuthorizationServiceHelpers
-
   let(:user) { create(:user) }
 
   context 'with public profile' do
@@ -88,24 +86,4 @@ describe 'User page' do
       end
     end
   end
-
-  context 'most recent activity' do
-    it 'shows the most recent activity' do
-      visit(user_path(user))
-
-      expect(page).to have_content('Most Recent Activity')
-    end
-
-    context 'when external authorization is enabled' do
-      before do
-        enable_external_authorization_service_check
-      end
-
-      it 'hides the most recent activity' do
-        visit(user_path(user))
-
-        expect(page).not_to have_content('Most Recent Activity')
-      end
-    end
-  end
 end