diff options
Diffstat (limited to 'spec/frontend/pages')
6 files changed, 38 insertions, 94 deletions
diff --git a/spec/frontend/pages/admin/users/components/__snapshots__/user_operation_confirmation_modal_spec.js.snap b/spec/frontend/pages/admin/users/components/__snapshots__/user_operation_confirmation_modal_spec.js.snap deleted file mode 100644 index dbf8caae357..00000000000 --- a/spec/frontend/pages/admin/users/components/__snapshots__/user_operation_confirmation_modal_spec.js.snap +++ /dev/null @@ -1,34 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`User Operation confirmation modal renders modal with form included 1`] = ` -<gl-modal-stub - modalclass="" - modalid="user-operation-modal" - ok-title="action" - ok-variant="warning" - size="md" - title="title" - titletag="h4" -> - <form - action="/url" - method="post" - > - <span> - content - </span> - - <input - name="_method" - type="hidden" - value="method" - /> - - <input - name="authenticity_token" - type="hidden" - value="csrf" - /> - </form> -</gl-modal-stub> -`; diff --git a/spec/frontend/pages/admin/users/components/user_modal_manager_spec.js b/spec/frontend/pages/admin/users/components/user_modal_manager_spec.js index 3d615d9d05f..6df2efd624d 100644 --- a/spec/frontend/pages/admin/users/components/user_modal_manager_spec.js +++ b/spec/frontend/pages/admin/users/components/user_modal_manager_spec.js @@ -14,21 +14,18 @@ describe('Users admin page Modal Manager', () => { }, }; - const actionModals = { - action1: ModalStub, - action2: ModalStub, - }; - let wrapper; const createComponent = (props = {}) => { wrapper = mount(UserModalManager, { propsData: { - actionModals, modalConfiguration, csrfToken: 'dummyCSRF', ...props, }, + stubs: { + DeleteUserModal: ModalStub, + }, }); }; @@ -43,11 +40,6 @@ describe('Users admin page Modal Manager', () => { expect(wrapper.find({ ref: 'modal' }).exists()).toBeFalsy(); }); - it('throws if non-existing action is requested', () => { - createComponent(); - expect(() => wrapper.vm.show({ glModalAction: 'non-existing' })).toThrow(); - }); - it('throws if action has no proper configuration', () => { createComponent({ modalConfiguration: {}, diff --git a/spec/frontend/pages/admin/users/components/user_operation_confirmation_modal_spec.js b/spec/frontend/pages/admin/users/components/user_operation_confirmation_modal_spec.js deleted file mode 100644 index f3a37a255cd..00000000000 --- a/spec/frontend/pages/admin/users/components/user_operation_confirmation_modal_spec.js +++ /dev/null @@ -1,46 +0,0 @@ -import { shallowMount } from '@vue/test-utils'; -import { GlModal } from '@gitlab/ui'; -import UserOperationConfirmationModal from '~/pages/admin/users/components/user_operation_confirmation_modal.vue'; - -describe('User Operation confirmation modal', () => { - let wrapper; - - const createComponent = (props = {}) => { - wrapper = shallowMount(UserOperationConfirmationModal, { - propsData: { - title: 'title', - content: 'content', - action: 'action', - url: '/url', - username: 'username', - csrfToken: 'csrf', - method: 'method', - ...props, - }, - }); - }; - - afterEach(() => { - wrapper.destroy(); - wrapper = null; - }); - - it('renders modal with form included', () => { - createComponent(); - expect(wrapper.element).toMatchSnapshot(); - }); - - it('closing modal with ok button triggers form submit', () => { - createComponent(); - const form = wrapper.find('form'); - jest.spyOn(form.element, 'submit').mockReturnValue(); - wrapper.find(GlModal).vm.$emit('ok'); - return wrapper.vm.$nextTick().then(() => { - expect(form.element.submit).toHaveBeenCalled(); - expect(form.element.action).toContain(wrapper.props('url')); - expect(new FormData(form.element).get('authenticity_token')).toEqual( - wrapper.props('csrfToken'), - ); - }); - }); -}); diff --git a/spec/frontend/pages/import/bitbucket_server/components/bitbucket_server_status_table_spec.js b/spec/frontend/pages/import/bitbucket_server/components/bitbucket_server_status_table_spec.js index 67ace608127..695d1b686a5 100644 --- a/spec/frontend/pages/import/bitbucket_server/components/bitbucket_server_status_table_spec.js +++ b/spec/frontend/pages/import/bitbucket_server/components/bitbucket_server_status_table_spec.js @@ -2,7 +2,7 @@ import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; import BitbucketServerStatusTable from '~/pages/import/bitbucket_server/status/components/bitbucket_server_status_table.vue'; -import BitbucketStatusTable from '~/import_projects/components/bitbucket_status_table.vue'; +import BitbucketStatusTable from '~/import_entities/import_projects/components/bitbucket_status_table.vue'; const BitbucketStatusTableStub = { name: 'BitbucketStatusTable', diff --git a/spec/frontend/pages/projects/graphs/__snapshots__/code_coverage_spec.js.snap b/spec/frontend/pages/projects/graphs/__snapshots__/code_coverage_spec.js.snap index 8ccad7d5c22..324c9788309 100644 --- a/spec/frontend/pages/projects/graphs/__snapshots__/code_coverage_spec.js.snap +++ b/spec/frontend/pages/projects/graphs/__snapshots__/code_coverage_spec.js.snap @@ -10,7 +10,7 @@ exports[`Code Coverage when fetching data is successful matches the snapshot 1`] <!----> <gl-dropdown-stub - category="tertiary" + category="primary" headertext="" size="medium" text="rspec" @@ -20,6 +20,7 @@ exports[`Code Coverage when fetching data is successful matches the snapshot 1`] avatarurl="" iconcolor="" iconname="" + iconrightarialabel="" iconrightname="" ischecked="true" ischeckitem="true" @@ -34,6 +35,7 @@ exports[`Code Coverage when fetching data is successful matches the snapshot 1`] avatarurl="" iconcolor="" iconname="" + iconrightarialabel="" iconrightname="" ischeckitem="true" secondarytext="" @@ -47,6 +49,7 @@ exports[`Code Coverage when fetching data is successful matches the snapshot 1`] avatarurl="" iconcolor="" iconname="" + iconrightarialabel="" iconrightname="" ischeckitem="true" secondarytext="" diff --git a/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js b/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js index e760cead760..0b58260ed1c 100644 --- a/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js +++ b/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js @@ -21,11 +21,13 @@ const defaultProps = { wikiAccessLevel: 20, snippetsAccessLevel: 20, pagesAccessLevel: 10, + analyticsAccessLevel: 20, containerRegistryEnabled: true, lfsEnabled: true, emailsDisabled: false, packagesEnabled: true, showDefaultAwardEmojis: true, + allowEditingCommitMessages: false, }, canDisableEmails: true, canChangeVisibilityLevel: true, @@ -49,7 +51,7 @@ describe('Settings Panel', () => { let wrapper; const mountComponent = ( - { currentSettings = {}, ...customProps } = {}, + { currentSettings = {}, glFeatures = {}, ...customProps } = {}, mountFn = shallowMount, ) => { const propsData = { @@ -60,6 +62,9 @@ describe('Settings Panel', () => { return mountFn(settingsPanel, { propsData, + provide: { + glFeatures, + }, }); }; @@ -75,6 +80,8 @@ describe('Settings Panel', () => { const findRepositoryFeatureSetting = () => findRepositoryFeatureProjectRow().find(projectFeatureSetting); + const findAnalyticsRow = () => wrapper.find({ ref: 'analytics-settings' }); + beforeEach(() => { wrapper = mountComponent(); }); @@ -539,4 +546,26 @@ describe('Settings Panel', () => { expect(metricsSettingsRow.find('select').attributes('disabled')).toBe('disabled'); }); }); + + describe('Settings panel with feature flags', () => { + describe('Allow edit of commit message', () => { + it('should show the allow editing of commit messages checkbox', async () => { + wrapper = mountComponent({ + glFeatures: { allowEditingCommitMessages: true }, + }); + + await wrapper.vm.$nextTick(); + + expect(wrapper.find({ ref: 'allow-editing-commit-messages' }).exists()).toBe(true); + }); + }); + }); + + describe('Analytics', () => { + it('should show the analytics toggle', async () => { + await wrapper.vm.$nextTick(); + + expect(findAnalyticsRow().exists()).toBe(true); + }); + }); }); |