diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 11:33:21 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 11:33:21 +0000 |
commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /spec/frontend/pages | |
parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) | |
download | gitlab-ce-7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0.tar.gz |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'spec/frontend/pages')
4 files changed, 29 insertions, 134 deletions
diff --git a/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap b/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap index aab78c99190..6b6833b00c3 100644 --- a/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap +++ b/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap @@ -147,6 +147,7 @@ exports[`Learn GitLab renders correctly 1`] = ` <div> <a class="gl-link" + data-qa-selector="uncompleted_learn_gitlab_link" data-testid="uncompleted-learn-gitlab-link" data-track-action="click_link" data-track-label="set_up_your_first_project_s_ci_cd" @@ -171,6 +172,7 @@ exports[`Learn GitLab renders correctly 1`] = ` <div> <a class="gl-link" + data-qa-selector="uncompleted_learn_gitlab_link" data-testid="uncompleted-learn-gitlab-link" data-track-action="click_link" data-track-label="start_a_free_trial_of_gitlab_ultimate" @@ -196,6 +198,7 @@ exports[`Learn GitLab renders correctly 1`] = ` <div> <a class="gl-link" + data-qa-selector="uncompleted_learn_gitlab_link" data-testid="uncompleted-learn-gitlab-link" data-track-action="click_link" data-track-label="add_code_owners" @@ -228,6 +231,7 @@ exports[`Learn GitLab renders correctly 1`] = ` <div> <a class="gl-link" + data-qa-selector="uncompleted_learn_gitlab_link" data-testid="uncompleted-learn-gitlab-link" data-track-action="click_link" data-track-label="enable_require_merge_approvals" @@ -294,6 +298,7 @@ exports[`Learn GitLab renders correctly 1`] = ` <div> <a class="gl-link" + data-qa-selector="uncompleted_learn_gitlab_link" data-testid="uncompleted-learn-gitlab-link" data-track-action="click_link" data-track-label="create_an_issue" @@ -318,6 +323,7 @@ exports[`Learn GitLab renders correctly 1`] = ` <div> <a class="gl-link" + data-qa-selector="uncompleted_learn_gitlab_link" data-testid="uncompleted-learn-gitlab-link" data-track-action="click_link" data-track-label="submit_a_merge_request_mr" @@ -376,6 +382,7 @@ exports[`Learn GitLab renders correctly 1`] = ` <div> <a class="gl-link" + data-qa-selector="uncompleted_learn_gitlab_link" data-testid="uncompleted-learn-gitlab-link" data-track-action="click_link" data-track-label="run_a_security_scan_using_ci_cd" diff --git a/spec/frontend/pages/projects/pipeline_schedules/shared/components/timezone_dropdown_spec.js b/spec/frontend/pages/projects/pipeline_schedules/shared/components/timezone_dropdown_spec.js index f54d56c3af4..4cac642bb50 100644 --- a/spec/frontend/pages/projects/pipeline_schedules/shared/components/timezone_dropdown_spec.js +++ b/spec/frontend/pages/projects/pipeline_schedules/shared/components/timezone_dropdown_spec.js @@ -1,139 +1,7 @@ -import $ from 'jquery'; -import { loadHTMLFixture, resetHTMLFixture } from 'helpers/fixtures'; import { formatUtcOffset, formatTimezone } from '~/lib/utils/datetime_utility'; -import TimezoneDropdown, { - findTimezoneByIdentifier, -} from '~/pages/projects/pipeline_schedules/shared/components/timezone_dropdown'; +import { findTimezoneByIdentifier } from '~/pages/projects/pipeline_schedules/shared/components/timezone_dropdown'; describe('Timezone Dropdown', () => { - let $inputEl = null; - let $dropdownEl = null; - let $wrapper = null; - const tzListSel = '.dropdown-content ul li a.is-active'; - - const initTimezoneDropdown = (options = {}) => { - // eslint-disable-next-line no-new - new TimezoneDropdown({ - $inputEl, - $dropdownEl, - ...options, - }); - }; - - const findDropdownToggleText = () => $wrapper.find('.dropdown-toggle-text'); - - describe('Initialize', () => { - describe('with dropdown already loaded', () => { - beforeEach(() => { - loadHTMLFixture('pipeline_schedules/edit.html'); - $wrapper = $('.dropdown'); - $inputEl = $('#schedule_cron_timezone'); - $inputEl.val(''); - $dropdownEl = $('.js-timezone-dropdown'); - }); - - afterEach(() => { - resetHTMLFixture(); - }); - - it('can take an $inputEl in the constructor', () => { - initTimezoneDropdown(); - - const tzStr = '[UTC + 5.5] Sri Jayawardenepura'; - const tzValue = 'Asia/Colombo'; - - expect($inputEl.val()).toBe('Etc/UTC'); - - $(`${tzListSel}:contains('${tzStr}')`, $wrapper).trigger('click'); - - const val = $inputEl.val(); - - expect(val).toBe(tzValue); - expect(val).not.toBe('Etc/UTC'); - }); - - it('will format data array of timezones into a list of offsets', () => { - initTimezoneDropdown(); - - const data = $dropdownEl.data('data'); - const formatted = $wrapper.find(tzListSel).text(); - - data.forEach((item) => { - expect(formatted).toContain(formatTimezone(item)); - }); - }); - - describe('when `allowEmpty` property is `false`', () => { - beforeEach(() => { - initTimezoneDropdown(); - }); - - it('will default the timezone to UTC', () => { - const tz = $inputEl.val(); - - expect(tz).toBe('Etc/UTC'); - }); - }); - - describe('when `allowEmpty` property is `true`', () => { - beforeEach(() => { - initTimezoneDropdown({ - allowEmpty: true, - }); - }); - - it('will default the value of the input to an empty string', () => { - expect($inputEl.val()).toBe(''); - }); - }); - }); - - describe('without dropdown loaded', () => { - beforeEach(() => { - loadHTMLFixture('pipeline_schedules/edit.html'); - $wrapper = $('.dropdown'); - $inputEl = $('#schedule_cron_timezone'); - $dropdownEl = $('.js-timezone-dropdown'); - }); - - it('will populate the list of UTC offsets after the dropdown is loaded', () => { - expect($wrapper.find(tzListSel).length).toEqual(0); - - initTimezoneDropdown(); - - expect($wrapper.find(tzListSel).length).toEqual($($dropdownEl).data('data').length); - }); - - it('will call a provided handler when a new timezone is selected', () => { - const onSelectTimezone = jest.fn(); - - initTimezoneDropdown({ onSelectTimezone }); - - $wrapper.find(tzListSel).first().trigger('click'); - - expect(onSelectTimezone).toHaveBeenCalled(); - }); - - it('will correctly set the dropdown label if a timezone identifier is set on the inputEl', () => { - $inputEl.val('America/St_Johns'); - - initTimezoneDropdown({ displayFormat: (selectedItem) => formatTimezone(selectedItem) }); - - expect(findDropdownToggleText().html()).toEqual('[UTC - 2.5] Newfoundland'); - }); - - it('will call a provided `displayFormat` handler to format the dropdown value', () => { - const displayFormat = jest.fn(); - - initTimezoneDropdown({ displayFormat }); - - $wrapper.find(tzListSel).first().trigger('click'); - - expect(displayFormat).toHaveBeenCalled(); - }); - }); - }); - describe('formatUtcOffset', () => { it('will convert negative utc offsets in seconds to hours and minutes', () => { expect(formatUtcOffset(-21600)).toEqual('- 6'); 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 ed7d4ad269e..b202a148306 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 @@ -137,6 +137,8 @@ describe('Settings Panel', () => { const findConfirmDangerButton = () => wrapper.findComponent(ConfirmDanger); const findEnvironmentsSettings = () => wrapper.findComponent({ ref: 'environments-settings' }); const findFeatureFlagsSettings = () => wrapper.findComponent({ ref: 'feature-flags-settings' }); + const findInfrastructureSettings = () => + wrapper.findComponent({ ref: 'infrastructure-settings' }); const findReleasesSettings = () => wrapper.findComponent({ ref: 'environments-settings' }); const findMonitorSettings = () => wrapper.findComponent({ ref: 'monitor-settings' }); @@ -841,6 +843,24 @@ describe('Settings Panel', () => { }); }); }); + describe('Infrastructure', () => { + describe('with feature flag', () => { + it('should show the infrastructure toggle', () => { + wrapper = mountComponent({ + glFeatures: { splitOperationsVisibilityPermissions: true }, + }); + + expect(findInfrastructureSettings().exists()).toBe(true); + }); + }); + describe('without feature flag', () => { + it('should not show the infrastructure toggle', () => { + wrapper = mountComponent({}); + + expect(findInfrastructureSettings().exists()).toBe(false); + }); + }); + }); describe('Releases', () => { describe('with feature flag', () => { it('should show the releases toggle', () => { diff --git a/spec/frontend/pages/shared/wikis/components/wiki_form_spec.js b/spec/frontend/pages/shared/wikis/components/wiki_form_spec.js index 0f947e84e0f..67d0fbdd9d1 100644 --- a/spec/frontend/pages/shared/wikis/components/wiki_form_spec.js +++ b/spec/frontend/pages/shared/wikis/components/wiki_form_spec.js @@ -116,7 +116,7 @@ describe('WikiForm', () => { renderMarkdownPath: pageInfoPersisted.markdownPreviewPath, markdownDocsPath: pageInfoPersisted.markdownHelpPath, uploadsPath: pageInfoPersisted.uploadsPath, - initOnAutofocus: pageInfoPersisted.persisted, + autofocus: pageInfoPersisted.persisted, formFieldId: 'wiki_content', formFieldName: 'wiki[content]', }), |