diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-15 01:06:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-15 01:06:19 +0300 |
commit | a16072c2f88191585b0a69825b4b0fe53984cc80 (patch) | |
tree | acc57b77209fd7a54512e75324b174e4cff6198a /spec/frontend | |
parent | 045e5c9a98f55302c35a50ff184d436ca3c3c0e3 (diff) |
Add latest changes from gitlab-org/gitlab@15-8-stable-ee
Diffstat (limited to 'spec/frontend')
3 files changed, 7 insertions, 102 deletions
diff --git a/spec/frontend/gitlab_version_check/components/security_patch_upgrade_alert_spec.js b/spec/frontend/gitlab_version_check/components/security_patch_upgrade_alert_spec.js deleted file mode 100644 index 665dacd5c47..00000000000 --- a/spec/frontend/gitlab_version_check/components/security_patch_upgrade_alert_spec.js +++ /dev/null @@ -1,84 +0,0 @@ -import { GlAlert, GlButton, GlLink, GlSprintf } from '@gitlab/ui'; -import { shallowMount } from '@vue/test-utils'; -import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; -import SecurityPatchUpgradeAlert from '~/gitlab_version_check/components/security_patch_upgrade_alert.vue'; -import { UPGRADE_DOCS_URL, ABOUT_RELEASES_PAGE } from '~/gitlab_version_check/constants'; - -describe('SecurityPatchUpgradeAlert', () => { - let wrapper; - let trackingSpy; - - const defaultProps = { - currentVersion: '99.9', - }; - - const createComponent = () => { - trackingSpy = mockTracking(undefined, undefined, jest.spyOn); - - wrapper = shallowMount(SecurityPatchUpgradeAlert, { - propsData: { - ...defaultProps, - }, - stubs: { - GlAlert, - GlSprintf, - }, - }); - }; - - afterEach(() => { - unmockTracking(); - }); - - const findGlAlert = () => wrapper.findComponent(GlAlert); - const findGlButton = () => wrapper.findComponent(GlButton); - const findGlLink = () => wrapper.findComponent(GlLink); - - describe('template', () => { - beforeEach(() => { - createComponent(); - }); - - it('renders non-dismissible GlAlert with version information', () => { - expect(findGlAlert().text()).toContain( - `You are currently on version ${defaultProps.currentVersion}.`, - ); - expect(findGlAlert().props('dismissible')).toBe(false); - }); - - it('tracks render security_patch_upgrade_alert correctly', () => { - expect(trackingSpy).toHaveBeenCalledWith(undefined, 'render', { - label: 'security_patch_upgrade_alert', - property: defaultProps.currentVersion, - }); - }); - - it('renders GlLink with correct text and link', () => { - expect(findGlLink().text()).toBe('Learn more about this critical security release.'); - expect(findGlLink().attributes('href')).toBe(ABOUT_RELEASES_PAGE); - }); - - it('tracks click security_patch_upgrade_alert_learn_more when link is clicked', async () => { - await findGlLink().vm.$emit('click'); - - expect(trackingSpy).toHaveBeenCalledWith(undefined, 'click_link', { - label: 'security_patch_upgrade_alert_learn_more', - property: defaultProps.currentVersion, - }); - }); - - it('renders GlButton with correct text and link', () => { - expect(findGlButton().text()).toBe('Upgrade now'); - expect(findGlButton().attributes('href')).toBe(UPGRADE_DOCS_URL); - }); - - it('tracks click security_patch_upgrade_alert_upgrade_now when button is clicked', async () => { - await findGlButton().vm.$emit('click'); - - expect(trackingSpy).toHaveBeenCalledWith(undefined, 'click_link', { - label: 'security_patch_upgrade_alert_upgrade_now', - property: defaultProps.currentVersion, - }); - }); - }); -}); diff --git a/spec/frontend/gitlab_version_check/index_spec.js b/spec/frontend/gitlab_version_check/index_spec.js index 92bc103cede..893105969ed 100644 --- a/spec/frontend/gitlab_version_check/index_spec.js +++ b/spec/frontend/gitlab_version_check/index_spec.js @@ -7,9 +7,6 @@ import { VERSION_CHECK_BADGE_FIXTURE, VERSION_CHECK_BADGE_FINDER, VERSION_BADGE_TEXT, - SECURITY_PATCH_FIXTURE, - SECURITY_PATCH_FINDER, - SECURITY_PATCH_TEXT, SECURITY_MODAL_FIXTURE, SECURITY_MODAL_FINDER, SECURITY_MODAL_TEXT, @@ -29,15 +26,13 @@ describe('initGitlabVersionCheck', () => { }); describe.each` - description | fixture | finders | componentTexts - ${'with no version check elements'} | ${'<div></div>'} | ${[]} | ${[]} - ${'with version check badge el but no prop data'} | ${VERSION_CHECK_BADGE_NO_PROP_FIXTURE} | ${[VERSION_CHECK_BADGE_FINDER]} | ${[undefined]} - ${'with version check badge el but no severity data'} | ${VERSION_CHECK_BADGE_NO_SEVERITY_FIXTURE} | ${[VERSION_CHECK_BADGE_FINDER]} | ${[undefined]} - ${'with version check badge el and version data'} | ${VERSION_CHECK_BADGE_FIXTURE} | ${[VERSION_CHECK_BADGE_FINDER]} | ${[VERSION_BADGE_TEXT]} - ${'with security patch el'} | ${SECURITY_PATCH_FIXTURE} | ${[SECURITY_PATCH_FINDER]} | ${[SECURITY_PATCH_TEXT]} - ${'with security patch and version badge els'} | ${`${SECURITY_PATCH_FIXTURE}${VERSION_CHECK_BADGE_FIXTURE}`} | ${[SECURITY_PATCH_FINDER, VERSION_CHECK_BADGE_FINDER]} | ${[SECURITY_PATCH_TEXT, VERSION_BADGE_TEXT]} - ${'with security modal el'} | ${SECURITY_MODAL_FIXTURE} | ${[SECURITY_MODAL_FINDER]} | ${[SECURITY_MODAL_TEXT]} - ${'with security modal, security patch, and version badge els'} | ${`${SECURITY_PATCH_FIXTURE}${SECURITY_MODAL_FIXTURE}${VERSION_CHECK_BADGE_FIXTURE}`} | ${[SECURITY_PATCH_FINDER, SECURITY_MODAL_FINDER, VERSION_CHECK_BADGE_FINDER]} | ${[SECURITY_PATCH_TEXT, SECURITY_MODAL_TEXT, VERSION_BADGE_TEXT]} + description | fixture | finders | componentTexts + ${'with no version check elements'} | ${'<div></div>'} | ${[]} | ${[]} + ${'with version check badge el but no prop data'} | ${VERSION_CHECK_BADGE_NO_PROP_FIXTURE} | ${[VERSION_CHECK_BADGE_FINDER]} | ${[undefined]} + ${'with version check badge el but no severity data'} | ${VERSION_CHECK_BADGE_NO_SEVERITY_FIXTURE} | ${[VERSION_CHECK_BADGE_FINDER]} | ${[undefined]} + ${'with version check badge el and version data'} | ${VERSION_CHECK_BADGE_FIXTURE} | ${[VERSION_CHECK_BADGE_FINDER]} | ${[VERSION_BADGE_TEXT]} + ${'with security modal el'} | ${SECURITY_MODAL_FIXTURE} | ${[SECURITY_MODAL_FINDER]} | ${[SECURITY_MODAL_TEXT]} + ${'with security modal and version badge els'} | ${`${SECURITY_MODAL_FIXTURE}${VERSION_CHECK_BADGE_FIXTURE}`} | ${[SECURITY_MODAL_FINDER, VERSION_CHECK_BADGE_FINDER]} | ${[SECURITY_MODAL_TEXT, VERSION_BADGE_TEXT]} `('$description', ({ fixture, finders, componentTexts }) => { beforeEach(() => { createApp(fixture); diff --git a/spec/frontend/gitlab_version_check/mock_data.js b/spec/frontend/gitlab_version_check/mock_data.js index 707d45550eb..fb8c9ec81a7 100644 --- a/spec/frontend/gitlab_version_check/mock_data.js +++ b/spec/frontend/gitlab_version_check/mock_data.js @@ -9,12 +9,6 @@ export const VERSION_CHECK_BADGE_FINDER = '[data-testid="badge-click-wrapper"]'; export const VERSION_BADGE_TEXT = 'Up to date'; -export const SECURITY_PATCH_FIXTURE = `<div id="js-security-patch-upgrade-alert" data-current-version="15.1"></div>`; - -export const SECURITY_PATCH_FINDER = 'h2'; - -export const SECURITY_PATCH_TEXT = 'Critical security upgrade available'; - export const SECURITY_MODAL_FIXTURE = `<div id="js-security-patch-upgrade-alert-modal" data-current-version="15.1" data-version='{ "details": "test details", "latest-stable-versions": "[]" }'></div>`; export const SECURITY_MODAL_FINDER = '[data-testid="alert-modal-title"]'; |