diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /spec/frontend/environments | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'spec/frontend/environments')
5 files changed, 9 insertions, 9 deletions
diff --git a/spec/frontend/environments/environment_actions_spec.js b/spec/frontend/environments/environment_actions_spec.js index 4c06e19cec0..e7f5ee4bc4d 100644 --- a/spec/frontend/environments/environment_actions_spec.js +++ b/spec/frontend/environments/environment_actions_spec.js @@ -1,9 +1,9 @@ import { shallowMount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; +import { GlLoadingIcon } 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'; -import { GlLoadingIcon } from '@gitlab/ui'; describe('EnvironmentActions Component', () => { let vm; diff --git a/spec/frontend/environments/environment_external_url_spec.js b/spec/frontend/environments/environment_external_url_spec.js index 9997ea94941..4c133665979 100644 --- a/spec/frontend/environments/environment_external_url_spec.js +++ b/spec/frontend/environments/environment_external_url_spec.js @@ -1,4 +1,4 @@ -import { shallowMount } from '@vue/test-utils'; +import { mount } from '@vue/test-utils'; import ExternalUrlComp from '~/environments/components/environment_external_url.vue'; describe('External URL Component', () => { @@ -6,7 +6,7 @@ describe('External URL Component', () => { const externalUrl = 'https://gitlab.com'; beforeEach(() => { - wrapper = shallowMount(ExternalUrlComp, { propsData: { externalUrl } }); + wrapper = mount(ExternalUrlComp, { propsData: { externalUrl } }); }); it('should link to the provided externalUrl prop', () => { diff --git a/spec/frontend/environments/environment_stop_spec.js b/spec/frontend/environments/environment_stop_spec.js index f971cf56b65..1865403cdc4 100644 --- a/spec/frontend/environments/environment_stop_spec.js +++ b/spec/frontend/environments/environment_stop_spec.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { shallowMount } from '@vue/test-utils'; +import { GlButton } from '@gitlab/ui'; import StopComponent from '~/environments/components/environment_stop.vue'; -import LoadingButton from '~/vue_shared/components/loading_button.vue'; import eventHub from '~/environments/event_hub'; $.fn.tooltip = () => {}; @@ -17,7 +17,7 @@ describe('Stop Component', () => { }); }; - const findButton = () => wrapper.find(LoadingButton); + const findButton = () => wrapper.find(GlButton); beforeEach(() => { jest.spyOn(window, 'confirm'); diff --git a/spec/frontend/environments/environments_app_spec.js b/spec/frontend/environments/environments_app_spec.js index c0bf0dca176..d440bf73e15 100644 --- a/spec/frontend/environments/environments_app_spec.js +++ b/spec/frontend/environments/environments_app_spec.js @@ -1,6 +1,6 @@ import { mount, shallowMount } from '@vue/test-utils'; -import axios from '~/lib/utils/axios_utils'; import MockAdapter from 'axios-mock-adapter'; +import axios from '~/lib/utils/axios_utils'; import Container from '~/environments/components/container.vue'; import EmptyState from '~/environments/components/empty_state.vue'; import EnvironmentsApp from '~/environments/components/environments_app.vue'; diff --git a/spec/frontend/environments/folder/environments_folder_view_spec.js b/spec/frontend/environments/folder/environments_folder_view_spec.js index 740225ddd9d..f33c8de0094 100644 --- a/spec/frontend/environments/folder/environments_folder_view_spec.js +++ b/spec/frontend/environments/folder/environments_folder_view_spec.js @@ -1,11 +1,11 @@ import { mount } from '@vue/test-utils'; -import axios from '~/lib/utils/axios_utils'; import MockAdapter from 'axios-mock-adapter'; +import { removeBreakLine, removeWhitespace } from 'helpers/text_helper'; +import { GlPagination } from '@gitlab/ui'; +import axios from '~/lib/utils/axios_utils'; import EnvironmentsFolderViewComponent from '~/environments/folder/environments_folder_view.vue'; import EnvironmentTable from '~/environments/components/environments_table.vue'; import { environmentsList } from '../mock_data'; -import { removeBreakLine, removeWhitespace } from 'helpers/text_helper'; -import { GlPagination } from '@gitlab/ui'; describe('Environments Folder View', () => { let mock; |