diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /spec/frontend/environments | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
download | gitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'spec/frontend/environments')
7 files changed, 21 insertions, 27 deletions
diff --git a/spec/frontend/environments/environment_actions_spec.js b/spec/frontend/environments/environment_actions_spec.js index e7f5ee4bc4d..ebdc4923045 100644 --- a/spec/frontend/environments/environment_actions_spec.js +++ b/spec/frontend/environments/environment_actions_spec.js @@ -1,9 +1,8 @@ import { shallowMount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; -import { GlLoadingIcon } from '@gitlab/ui'; +import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; import eventHub from '~/environments/event_hub'; import EnvironmentActions from '~/environments/components/environment_actions.vue'; -import Icon from '~/vue_shared/components/icon.vue'; describe('EnvironmentActions Component', () => { let vm; @@ -17,7 +16,7 @@ describe('EnvironmentActions Component', () => { }); it('should render a dropdown button with 2 icons', () => { - expect(vm.find('.dropdown-new').findAll(Icon).length).toBe(2); + expect(vm.find('.dropdown-new').findAll(GlIcon).length).toBe(2); }); it('should render a dropdown button with aria-label description', () => { @@ -60,11 +59,7 @@ describe('EnvironmentActions Component', () => { }); it("should render a disabled action when it's not playable", () => { - expect(vm.find('.dropdown-menu li:last-child button').attributes('disabled')).toEqual( - 'disabled', - ); - - expect(vm.find('.dropdown-menu li:last-child button').classes('disabled')).toBe(true); + expect(vm.find('.dropdown-menu li:last-child gl-button-stub').props('disabled')).toBe(true); }); }); @@ -82,7 +77,7 @@ describe('EnvironmentActions Component', () => { scheduledAt: '2018-10-05T08:23:00Z', }; const findDropdownItem = action => { - const buttons = vm.findAll('.dropdown-menu li button'); + const buttons = vm.findAll('.dropdown-menu li gl-button-stub'); return buttons.filter(button => button.text().startsWith(action.name)).at(0); }; @@ -96,7 +91,7 @@ describe('EnvironmentActions Component', () => { eventHub.$on('postAction', emitSpy); jest.spyOn(window, 'confirm').mockImplementation(() => true); - findDropdownItem(scheduledJobAction).trigger('click'); + findDropdownItem(scheduledJobAction).vm.$emit('click'); expect(window.confirm).toHaveBeenCalled(); expect(emitSpy).toHaveBeenCalledWith({ endpoint: scheduledJobAction.playPath }); @@ -107,7 +102,7 @@ describe('EnvironmentActions Component', () => { eventHub.$on('postAction', emitSpy); jest.spyOn(window, 'confirm').mockImplementation(() => false); - findDropdownItem(scheduledJobAction).trigger('click'); + findDropdownItem(scheduledJobAction).vm.$emit('click'); expect(window.confirm).toHaveBeenCalled(); expect(emitSpy).not.toHaveBeenCalled(); diff --git a/spec/frontend/environments/environment_item_spec.js b/spec/frontend/environments/environment_item_spec.js index 5d374a162ab..1b429783821 100644 --- a/spec/frontend/environments/environment_item_spec.js +++ b/spec/frontend/environments/environment_item_spec.js @@ -3,7 +3,7 @@ import { format } from 'timeago.js'; import EnvironmentItem from '~/environments/components/environment_item.vue'; import PinComponent from '~/environments/components/environment_pin.vue'; import DeleteComponent from '~/environments/components/environment_delete.vue'; - +import { differenceInMilliseconds } from '~/lib/utils/datetime_utility'; import { environment, folder, tableData } from './mock_data'; describe('Environment item', () => { @@ -135,7 +135,7 @@ describe('Environment item', () => { }); describe('in the past', () => { - const pastDate = new Date(Date.now() - 100000); + const pastDate = new Date(differenceInMilliseconds(100000)); beforeEach(() => { factory({ propsData: { diff --git a/spec/frontend/environments/environment_monitoring_spec.js b/spec/frontend/environments/environment_monitoring_spec.js index d2129bd7b30..a73f49f1047 100644 --- a/spec/frontend/environments/environment_monitoring_spec.js +++ b/spec/frontend/environments/environment_monitoring_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; +import { GlButton } from '@gitlab/ui'; import MonitoringComponent from '~/environments/components/environment_monitoring.vue'; -import Icon from '~/vue_shared/components/icon.vue'; describe('Monitoring Component', () => { let wrapper; @@ -15,8 +15,8 @@ describe('Monitoring Component', () => { }); }; - const findIcons = () => wrapper.findAll(Icon); - const findIconsByName = name => findIcons().filter(icon => icon.props('name') === name); + const findButtons = () => wrapper.findAll(GlButton); + const findButtonsByIcon = icon => findButtons().filter(button => button.props('icon') === icon); beforeEach(() => { createWrapper(); @@ -30,7 +30,7 @@ describe('Monitoring Component', () => { it('should render a link to environment monitoring page', () => { expect(wrapper.attributes('href')).toEqual(monitoringUrl); - expect(findIconsByName('chart').length).toBe(1); + expect(findButtonsByIcon('chart').length).toBe(1); expect(wrapper.attributes('title')).toBe('Monitoring'); expect(wrapper.attributes('aria-label')).toBe('Monitoring'); }); diff --git a/spec/frontend/environments/environment_pin_spec.js b/spec/frontend/environments/environment_pin_spec.js index 486f6db7366..f48091adb44 100644 --- a/spec/frontend/environments/environment_pin_spec.js +++ b/spec/frontend/environments/environment_pin_spec.js @@ -1,6 +1,5 @@ import { shallowMount } from '@vue/test-utils'; -import { GlDeprecatedButton } from '@gitlab/ui'; -import Icon from '~/vue_shared/components/icon.vue'; +import { GlButton, GlIcon } from '@gitlab/ui'; import eventHub from '~/environments/event_hub'; import PinComponent from '~/environments/components/environment_pin.vue'; @@ -32,12 +31,12 @@ describe('Pin Component', () => { }); it('should render the component with thumbtack icon', () => { - expect(wrapper.find(Icon).props('name')).toBe('thumbtack'); + expect(wrapper.find(GlIcon).props('name')).toBe('thumbtack'); }); it('should emit onPinClick when clicked', () => { const eventHubSpy = jest.spyOn(eventHub, '$emit'); - const button = wrapper.find(GlDeprecatedButton); + const button = wrapper.find(GlButton); button.vm.$emit('click'); diff --git a/spec/frontend/environments/environment_rollback_spec.js b/spec/frontend/environments/environment_rollback_spec.js index f25e05f9cd8..fb62a096c3d 100644 --- a/spec/frontend/environments/environment_rollback_spec.js +++ b/spec/frontend/environments/environment_rollback_spec.js @@ -1,5 +1,5 @@ import { shallowMount, mount } from '@vue/test-utils'; -import { GlDeprecatedButton } from '@gitlab/ui'; +import { GlButton } from '@gitlab/ui'; import eventHub from '~/environments/event_hub'; import RollbackComponent from '~/environments/components/environment_rollback.vue'; @@ -40,7 +40,7 @@ describe('Rollback Component', () => { }, }, }); - const button = wrapper.find(GlDeprecatedButton); + const button = wrapper.find(GlButton); button.vm.$emit('click'); diff --git a/spec/frontend/environments/environment_terminal_button_spec.js b/spec/frontend/environments/environment_terminal_button_spec.js index 007fda2f2cc..274186fbbd6 100644 --- a/spec/frontend/environments/environment_terminal_button_spec.js +++ b/spec/frontend/environments/environment_terminal_button_spec.js @@ -22,7 +22,7 @@ describe('Stop Component', () => { }); it('should render a link to open a web terminal with the provided path', () => { - expect(wrapper.is('a')).toBe(true); + expect(wrapper.element.tagName).toBe('A'); expect(wrapper.attributes('title')).toBe('Terminal'); expect(wrapper.attributes('aria-label')).toBe('Terminal'); expect(wrapper.attributes('href')).toBe(terminalPath); diff --git a/spec/frontend/environments/environments_app_spec.js b/spec/frontend/environments/environments_app_spec.js index d440bf73e15..fe32bf918dd 100644 --- a/spec/frontend/environments/environments_app_spec.js +++ b/spec/frontend/environments/environments_app_spec.js @@ -144,16 +144,16 @@ describe('Environment', () => { }); it('should open a closed folder', () => { - expect(wrapper.find('.folder-icon.ic-chevron-right').exists()).toBe(false); + expect(wrapper.find('.folder-icon[data-testid="chevron-right-icon"]').exists()).toBe(false); }); it('should close an opened folder', () => { - expect(wrapper.find('.folder-icon.ic-chevron-down').exists()).toBe(true); + expect(wrapper.find('.folder-icon[data-testid="chevron-down-icon"]').exists()).toBe(true); // close folder wrapper.find('.folder-name').trigger('click'); wrapper.vm.$nextTick(() => { - expect(wrapper.find('.folder-icon.ic-chevron-down').exists()).toBe(false); + expect(wrapper.find('.folder-icon[data-testid="chevron-down-icon"]').exists()).toBe(false); }); }); |