diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-18 00:09:56 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-18 00:09:56 +0300 |
commit | 9facfe5cb194005894467c06e4ea1a9800034ab4 (patch) | |
tree | 5ceaecd5f89725250bbf4119558715fa14576c4c /spec/frontend/incidents_settings | |
parent | 18da92341dac366b7bcfd13f2d3c443ffa315af0 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/incidents_settings')
-rw-r--r-- | spec/frontend/incidents_settings/components/incidents_settings_service_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/incidents_settings/components/pagerduty_form_spec.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/frontend/incidents_settings/components/incidents_settings_service_spec.js b/spec/frontend/incidents_settings/components/incidents_settings_service_spec.js index 58f9a318808..97f453b3a32 100644 --- a/spec/frontend/incidents_settings/components/incidents_settings_service_spec.js +++ b/spec/frontend/incidents_settings/components/incidents_settings_service_spec.js @@ -1,5 +1,5 @@ -import axios from '~/lib/utils/axios_utils'; import AxiosMockAdapter from 'axios-mock-adapter'; +import axios from '~/lib/utils/axios_utils'; import httpStatusCodes from '~/lib/utils/http_status'; import IncidentsSettingsService from '~/incidents_settings/incidents_settings_service'; import { ERROR_MSG } from '~/incidents_settings/constants'; diff --git a/spec/frontend/incidents_settings/components/pagerduty_form_spec.js b/spec/frontend/incidents_settings/components/pagerduty_form_spec.js index 521094ad54c..50d0de8a753 100644 --- a/spec/frontend/incidents_settings/components/pagerduty_form_spec.js +++ b/spec/frontend/incidents_settings/components/pagerduty_form_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import waitForPromises from 'helpers/wait_for_promises'; -import PagerDutySettingsForm from '~/incidents_settings/components/pagerduty_form.vue'; import { GlAlert, GlModal } from '@gitlab/ui'; +import PagerDutySettingsForm from '~/incidents_settings/components/pagerduty_form.vue'; describe('Alert integration settings form', () => { let wrapper; |