Add latest changes from gitlab-org/gitlab@master

5 files changed, 25 insertions, 134 deletions

diff --git a/spec/features/admin/admin_appearance_spec.rb b/spec/features/admin/admin_appearance_spec.rb
index cd148642b90..cb69eac8035 100644
--- a/spec/features/admin/admin_appearance_spec.rb
+++ b/spec/features/admin/admin_appearance_spec.rb
@@ -34,6 +34,10 @@ RSpec.describe 'Admin Appearance' do
     visit admin_application_settings_appearances_path
     click_link "Sign-in page"
 
+    expect(find('#login')).to be_disabled
+    expect(find('#password')).to be_disabled
+    expect(find('button')).to be_disabled
+
     expect_custom_sign_in_appearance(appearance)
   end
 
diff --git a/spec/frontend/admin/signup_restrictions/components/signup_form_spec.js b/spec/frontend/admin/signup_restrictions/components/signup_form_spec.js
index 4bb22feb913..5b4f954b672 100644
--- a/spec/frontend/admin/signup_restrictions/components/signup_form_spec.js
+++ b/spec/frontend/admin/signup_restrictions/components/signup_form_spec.js
@@ -35,9 +35,6 @@ describe('Signup Form', () => {
 
   const findDenyListRawInputGroup = () => wrapper.findByTestId('domain-denylist-raw-input-group');
   const findDenyListFileInputGroup = () => wrapper.findByTestId('domain-denylist-file-input-group');
-
-  const findRequireAdminApprovalCheckbox = () =>
-    wrapper.findByTestId('require-admin-approval-checkbox');
   const findUserCapInput = () => wrapper.findByTestId('user-cap-input');
   const findModal = () => wrapper.find(GlModal);
 
@@ -191,125 +188,6 @@ describe('Signup Form', () => {
   });
 
   describe('form submit button confirmation modal for side-effect of adding possibly unwanted new users', () => {
-    it.each`
-      requireAdminApprovalAction | userCapAction                          | pendingUserCount | buttonEffect
-      ${'unchanged from true'}   | ${'unchanged'}                         | ${0}             | ${'submits form'}
-      ${'unchanged from false'}  | ${'unchanged'}                         | ${0}             | ${'submits form'}
-      ${'toggled off'}           | ${'unchanged'}                         | ${1}             | ${'shows confirmation modal'}
-      ${'toggled off'}           | ${'unchanged'}                         | ${0}             | ${'submits form'}
-      ${'toggled on'}            | ${'unchanged'}                         | ${0}             | ${'submits form'}
-      ${'unchanged from false'}  | ${'increased'}                         | ${1}             | ${'shows confirmation modal'}
-      ${'unchanged from true'}   | ${'increased'}                         | ${0}             | ${'submits form'}
-      ${'toggled off'}           | ${'increased'}                         | ${1}             | ${'shows confirmation modal'}
-      ${'toggled off'}           | ${'increased'}                         | ${0}             | ${'submits form'}
-      ${'toggled on'}            | ${'increased'}                         | ${1}             | ${'shows confirmation modal'}
-      ${'toggled on'}            | ${'increased'}                         | ${0}             | ${'submits form'}
-      ${'toggled on'}            | ${'decreased'}                         | ${0}             | ${'submits form'}
-      ${'toggled on'}            | ${'decreased'}                         | ${1}             | ${'submits form'}
-      ${'unchanged from false'}  | ${'changed from limited to unlimited'} | ${1}             | ${'shows confirmation modal'}
-      ${'unchanged from false'}  | ${'changed from limited to unlimited'} | ${0}             | ${'submits form'}
-      ${'unchanged from false'}  | ${'changed from unlimited to limited'} | ${0}             | ${'submits form'}
-      ${'unchanged from false'}  | ${'unchanged from unlimited'}          | ${0}             | ${'submits form'}
-    `(
-      '$buttonEffect if require admin approval for new sign-ups is $requireAdminApprovalAction and the user cap is $userCapAction and pending user count is $pendingUserCount',
-      async ({ requireAdminApprovalAction, userCapAction, pendingUserCount, buttonEffect }) => {
-        let isModalDisplayed;
-
-        switch (buttonEffect) {
-          case 'shows confirmation modal':
-            isModalDisplayed = true;
-            break;
-          case 'submits form':
-            isModalDisplayed = false;
-            break;
-          default:
-            isModalDisplayed = false;
-            break;
-        }
-
-        const isFormSubmittedWhenClickingFormSubmitButton = !isModalDisplayed;
-
-        const injectedProps = {
-          pendingUserCount,
-        };
-
-        const USER_CAP_DEFAULT = 5;
-
-        switch (userCapAction) {
-          case 'changed from unlimited to limited':
-            injectedProps.newUserSignupsCap = '';
-            break;
-          case 'unchanged from unlimited':
-            injectedProps.newUserSignupsCap = '';
-            break;
-          default:
-            injectedProps.newUserSignupsCap = USER_CAP_DEFAULT;
-            break;
-        }
-
-        switch (requireAdminApprovalAction) {
-          case 'unchanged from true':
-            injectedProps.requireAdminApprovalAfterUserSignup = true;
-            break;
-          case 'unchanged from false':
-            injectedProps.requireAdminApprovalAfterUserSignup = false;
-            break;
-          case 'toggled off':
-            injectedProps.requireAdminApprovalAfterUserSignup = true;
-            break;
-          case 'toggled on':
-            injectedProps.requireAdminApprovalAfterUserSignup = false;
-            break;
-          default:
-            injectedProps.requireAdminApprovalAfterUserSignup = false;
-            break;
-        }
-
-        formSubmitSpy = jest.spyOn(HTMLFormElement.prototype, 'submit').mockImplementation();
-
-        await mountComponent({
-          injectedProps,
-          stubs: { GlButton, GlModal: stubComponent(GlModal) },
-        });
-
-        findModal().vm.show = jest.fn();
-
-        if (
-          requireAdminApprovalAction === 'toggled off' ||
-          requireAdminApprovalAction === 'toggled on'
-        ) {
-          await findRequireAdminApprovalCheckbox().vm.$emit('input', false);
-        }
-
-        switch (userCapAction) {
-          case 'increased':
-            await findUserCapInput().vm.$emit('input', USER_CAP_DEFAULT + 1);
-            break;
-          case 'decreased':
-            await findUserCapInput().vm.$emit('input', USER_CAP_DEFAULT - 1);
-            break;
-          case 'changed from limited to unlimited':
-            await findUserCapInput().vm.$emit('input', '');
-            break;
-          case 'changed from unlimited to limited':
-            await findUserCapInput().vm.$emit('input', USER_CAP_DEFAULT);
-            break;
-          default:
-            break;
-        }
-
-        await findFormSubmitButton().trigger('click');
-
-        if (isFormSubmittedWhenClickingFormSubmitButton) {
-          expect(formSubmitSpy).toHaveBeenCalled();
-          expect(findModal().vm.show).not.toHaveBeenCalled();
-        } else {
-          expect(formSubmitSpy).not.toHaveBeenCalled();
-          expect(findModal().vm.show).toHaveBeenCalled();
-        }
-      },
-    );
-
     describe('modal actions', () => {
       beforeEach(async () => {
         const INITIAL_USER_CAP = 5;
diff --git a/spec/helpers/application_settings_helper_spec.rb b/spec/helpers/application_settings_helper_spec.rb
index ef5f6931d02..ef5c99efdd3 100644
--- a/spec/helpers/application_settings_helper_spec.rb
+++ b/spec/helpers/application_settings_helper_spec.rb
@@ -271,18 +271,6 @@ RSpec.describe ApplicationSettingsHelper do
         expect(pending_user_count).to eq 1
       end
     end
-
-    context 'when the new_user_signups_cap is not present' do
-      let(:user_cap) { nil }
-
-      it { is_expected.to eq 0 }
-
-      it 'does not query users unnecessarily' do
-        expect(User).not_to receive(:blocked_pending_approval)
-
-        pending_user_count
-      end
-    end
   end
 
   describe '#sidekiq_job_limiter_modes_for_select' do
diff --git a/spec/lib/sidebars/groups/menus/scope_menu_spec.rb b/spec/lib/sidebars/groups/menus/scope_menu_spec.rb
new file mode 100644
index 00000000000..4b77a09117a
--- /dev/null
+++ b/spec/lib/sidebars/groups/menus/scope_menu_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::Groups::Menus::ScopeMenu do
+  let(:group) { build(:group) }
+  let(:user) { group.owner }
+  let(:context) { Sidebars::Groups::Context.new(current_user: user, container: group) }
+
+  describe '#extra_nav_link_html_options' do
+    subject { described_class.new(context).extra_nav_link_html_options }
+
+    specify { is_expected.to match(hash_including(class: 'context-header has-tooltip', title: context.group.name)) }
+  end
+end
diff --git a/spec/lib/sidebars/projects/menus/scope_menu_spec.rb b/spec/lib/sidebars/projects/menus/scope_menu_spec.rb
index 5040ef9b0ff..980ab2f7c71 100644
--- a/spec/lib/sidebars/projects/menus/scope_menu_spec.rb
+++ b/spec/lib/sidebars/projects/menus/scope_menu_spec.rb
@@ -12,4 +12,10 @@ RSpec.describe Sidebars::Projects::Menus::ScopeMenu do
 
     specify { is_expected.to match(hash_including(class: 'shortcuts-project rspec-project-link')) }
   end
+
+  describe '#extra_nav_link_html_options' do
+    subject { described_class.new(context).extra_nav_link_html_options }
+
+    specify { is_expected.to match(hash_including(class: 'context-header has-tooltip', title: context.project.name)) }
+  end
 end