Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 80 deletions

diff --git a/spec/frontend/google_tag_manager/index_spec.js b/spec/frontend/google_tag_manager/index_spec.js
index 9c4b23e3a70..ec9e1ef8e5f 100644
--- a/spec/frontend/google_tag_manager/index_spec.js
+++ b/spec/frontend/google_tag_manager/index_spec.js
@@ -8,7 +8,6 @@ import {
   trackSaasTrialSubmit,
   trackSaasTrialSkip,
   trackSaasTrialGroup,
-  trackSaasTrialProject,
   trackSaasTrialGetStarted,
   trackTrialAcceptTerms,
   trackCheckout,
@@ -150,9 +149,6 @@ describe('~/google_tag_manager/index', () => {
     createTestCase(trackSaasTrialGroup, {
       forms: [{ cls: 'js-saas-trial-group', expectation: { event: 'saasTrialGroup' } }],
     }),
-    createTestCase(trackSaasTrialProject, {
-      forms: [{ id: 'new_project', expectation: { event: 'saasTrialProject' } }],
-    }),
     createTestCase(trackProjectImport, {
       links: [
         {
@@ -481,11 +477,11 @@ describe('~/google_tag_manager/index', () => {
     });
 
     it('no ops', () => {
-      setHTMLFixture(createHTML({ forms: [{ id: 'new_project' }] }));
+      setHTMLFixture(createHTML({ forms: [{ cls: 'js-saas-trial-group' }] }));
 
-      trackSaasTrialProject();
+      trackSaasTrialGroup();
 
-      triggerEvent('#new_project', 'submit');
+      triggerEvent('.js-saas-trial-group', 'submit');
 
       expect(spy).not.toHaveBeenCalled();
       expect(logError).not.toHaveBeenCalled();
@@ -506,11 +502,11 @@ describe('~/google_tag_manager/index', () => {
     });
 
     it('logs error', () => {
-      setHTMLFixture(createHTML({ forms: [{ id: 'new_project' }] }));
+      setHTMLFixture(createHTML({ forms: [{ cls: 'js-saas-trial-group' }] }));
 
-      trackSaasTrialProject();
+      trackSaasTrialGroup();
 
-      triggerEvent('#new_project', 'submit');
+      triggerEvent('.js-saas-trial-group', 'submit');
 
       expect(logError).toHaveBeenCalledWith(
         'Unexpected error while pushing to dataLayer',
diff --git a/spec/frontend/groups/components/visibility_level_dropdown_spec.js b/spec/frontend/groups/components/visibility_level_dropdown_spec.js
deleted file mode 100644
index 49d0b182f7f..00000000000
--- a/spec/frontend/groups/components/visibility_level_dropdown_spec.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
-import { shallowMount } from '@vue/test-utils';
-import Component from '~/groups/components/visibility_level_dropdown.vue';
-
-describe('Visibility Level Dropdown', () => {
-  let wrapper;
-
-  const options = [
-    { level: 0, label: 'Private', description: 'Private description' },
-    { level: 20, label: 'Public', description: 'Public description' },
-  ];
-  const defaultLevel = 0;
-
-  const createComponent = (propsData) => {
-    wrapper = shallowMount(Component, {
-      propsData,
-    });
-  };
-
-  beforeEach(() => {
-    createComponent({
-      visibilityLevelOptions: options,
-      defaultLevel,
-    });
-  });
-
-  afterEach(() => {
-    wrapper.destroy();
-    wrapper = null;
-  });
-
-  const hiddenInputValue = () =>
-    wrapper.find("input[name='group[visibility_level]']").attributes('value');
-  const dropdownText = () => wrapper.findComponent(GlDropdown).props('text');
-  const findDropdownItems = () =>
-    wrapper.findAllComponents(GlDropdownItem).wrappers.map((option) => ({
-      text: option.text(),
-      secondaryText: option.props('secondaryText'),
-    }));
-
-  describe('Default values', () => {
-    it('sets the value of the hidden input to the default value', () => {
-      expect(hiddenInputValue()).toBe(options[0].level.toString());
-    });
-
-    it('sets the text of the dropdown to the default value', () => {
-      expect(dropdownText()).toBe(options[0].label);
-    });
-
-    it('shows all dropdown options', () => {
-      expect(findDropdownItems()).toEqual(
-        options.map(({ label, description }) => ({ text: label, secondaryText: description })),
-      );
-    });
-  });
-
-  describe('Selecting an option', () => {
-    beforeEach(() => {
-      wrapper.findAllComponents(GlDropdownItem).at(1).vm.$emit('click');
-    });
-
-    it('sets the value of the hidden input to the selected value', () => {
-      expect(hiddenInputValue()).toBe(options[1].level.toString());
-    });
-
-    it('sets the text of the dropdown to the selected value', () => {
-      expect(dropdownText()).toBe(options[1].label);
-    });
-  });
-});