diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-21 06:08:41 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-21 06:08:41 +0000 |
commit | 66c3e34b4f4931f613a6ff65435c19e9373c2a6a (patch) | |
tree | ed8ade5810abde1947fcc0e2b6231c0be82f327d /spec/frontend/jira_connect | |
parent | a6ebd13ef8a8b95d7b12a442fdb99b03092e98ba (diff) | |
download | gitlab-ce-66c3e34b4f4931f613a6ff65435c19e9373c2a6a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/jira_connect')
-rw-r--r-- | spec/frontend/jira_connect/subscriptions/api_spec.js (renamed from spec/frontend/jira_connect/api_spec.js) | 6 | ||||
-rw-r--r-- | spec/frontend/jira_connect/subscriptions/components/__snapshots__/group_item_name_spec.js.snap (renamed from spec/frontend/jira_connect/components/__snapshots__/group_item_name_spec.js.snap) | 0 | ||||
-rw-r--r-- | spec/frontend/jira_connect/subscriptions/components/app_spec.js (renamed from spec/frontend/jira_connect/components/app_spec.js) | 8 | ||||
-rw-r--r-- | spec/frontend/jira_connect/subscriptions/components/group_item_name_spec.js (renamed from spec/frontend/jira_connect/components/group_item_name_spec.js) | 2 | ||||
-rw-r--r-- | spec/frontend/jira_connect/subscriptions/components/groups_list_item_spec.js (renamed from spec/frontend/jira_connect/components/groups_list_item_spec.js) | 10 | ||||
-rw-r--r-- | spec/frontend/jira_connect/subscriptions/components/groups_list_spec.js (renamed from spec/frontend/jira_connect/components/groups_list_spec.js) | 10 | ||||
-rw-r--r-- | spec/frontend/jira_connect/subscriptions/components/subscriptions_list_spec.js (renamed from spec/frontend/jira_connect/components/subscriptions_list_spec.js) | 12 | ||||
-rw-r--r-- | spec/frontend/jira_connect/subscriptions/index_spec.js (renamed from spec/frontend/jira_connect/index_spec.js) | 4 | ||||
-rw-r--r-- | spec/frontend/jira_connect/subscriptions/mock_data.js (renamed from spec/frontend/jira_connect/mock_data.js) | 0 | ||||
-rw-r--r-- | spec/frontend/jira_connect/subscriptions/store/mutations_spec.js (renamed from spec/frontend/jira_connect/store/mutations_spec.js) | 4 | ||||
-rw-r--r-- | spec/frontend/jira_connect/subscriptions/utils_spec.js (renamed from spec/frontend/jira_connect/utils_spec.js) | 4 |
11 files changed, 30 insertions, 30 deletions
diff --git a/spec/frontend/jira_connect/api_spec.js b/spec/frontend/jira_connect/subscriptions/api_spec.js index 88922999715..57b11bdbc27 100644 --- a/spec/frontend/jira_connect/api_spec.js +++ b/spec/frontend/jira_connect/subscriptions/api_spec.js @@ -1,10 +1,10 @@ import MockAdapter from 'axios-mock-adapter'; -import { addSubscription, removeSubscription, fetchGroups } from '~/jira_connect/api'; -import { getJwt } from '~/jira_connect/utils'; +import { addSubscription, removeSubscription, fetchGroups } from '~/jira_connect/subscriptions/api'; +import { getJwt } from '~/jira_connect/subscriptions/utils'; import axios from '~/lib/utils/axios_utils'; import httpStatus from '~/lib/utils/http_status'; -jest.mock('~/jira_connect/utils', () => ({ +jest.mock('~/jira_connect/subscriptions/utils', () => ({ getJwt: jest.fn().mockResolvedValue('jwt'), })); diff --git a/spec/frontend/jira_connect/components/__snapshots__/group_item_name_spec.js.snap b/spec/frontend/jira_connect/subscriptions/components/__snapshots__/group_item_name_spec.js.snap index 21c903f064d..21c903f064d 100644 --- a/spec/frontend/jira_connect/components/__snapshots__/group_item_name_spec.js.snap +++ b/spec/frontend/jira_connect/subscriptions/components/__snapshots__/group_item_name_spec.js.snap diff --git a/spec/frontend/jira_connect/components/app_spec.js b/spec/frontend/jira_connect/subscriptions/components/app_spec.js index e0d61d8209b..8915a7697a5 100644 --- a/spec/frontend/jira_connect/components/app_spec.js +++ b/spec/frontend/jira_connect/subscriptions/components/app_spec.js @@ -1,12 +1,12 @@ import { GlAlert, GlButton, GlModal, GlLink } from '@gitlab/ui'; import { mount, shallowMount } from '@vue/test-utils'; -import JiraConnectApp from '~/jira_connect/components/app.vue'; -import createStore from '~/jira_connect/store'; -import { SET_ALERT } from '~/jira_connect/store/mutation_types'; +import JiraConnectApp from '~/jira_connect/subscriptions/components/app.vue'; +import createStore from '~/jira_connect/subscriptions/store'; +import { SET_ALERT } from '~/jira_connect/subscriptions/store/mutation_types'; import { __ } from '~/locale'; -jest.mock('~/jira_connect/utils', () => ({ +jest.mock('~/jira_connect/subscriptions/utils', () => ({ retrieveAlert: jest.fn().mockReturnValue({ message: 'error message' }), getLocation: jest.fn(), })); diff --git a/spec/frontend/jira_connect/components/group_item_name_spec.js b/spec/frontend/jira_connect/subscriptions/components/group_item_name_spec.js index ea0067f8ed1..b5fe08486b1 100644 --- a/spec/frontend/jira_connect/components/group_item_name_spec.js +++ b/spec/frontend/jira_connect/subscriptions/components/group_item_name_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import GroupItemName from '~/jira_connect/components/group_item_name.vue'; +import GroupItemName from '~/jira_connect/subscriptions/components/group_item_name.vue'; import { mockGroup1 } from '../mock_data'; describe('GroupItemName', () => { diff --git a/spec/frontend/jira_connect/components/groups_list_item_spec.js b/spec/frontend/jira_connect/subscriptions/components/groups_list_item_spec.js index bcc27cc2898..b69435df83a 100644 --- a/spec/frontend/jira_connect/components/groups_list_item_spec.js +++ b/spec/frontend/jira_connect/subscriptions/components/groups_list_item_spec.js @@ -2,13 +2,13 @@ import { GlButton } from '@gitlab/ui'; import { mount, shallowMount } from '@vue/test-utils'; import waitForPromises from 'helpers/wait_for_promises'; -import * as JiraConnectApi from '~/jira_connect/api'; -import GroupItemName from '~/jira_connect/components/group_item_name.vue'; -import GroupsListItem from '~/jira_connect/components/groups_list_item.vue'; -import { persistAlert, reloadPage } from '~/jira_connect/utils'; +import * as JiraConnectApi from '~/jira_connect/subscriptions/api'; +import GroupItemName from '~/jira_connect/subscriptions/components/group_item_name.vue'; +import GroupsListItem from '~/jira_connect/subscriptions/components/groups_list_item.vue'; +import { persistAlert, reloadPage } from '~/jira_connect/subscriptions/utils'; import { mockGroup1 } from '../mock_data'; -jest.mock('~/jira_connect/utils'); +jest.mock('~/jira_connect/subscriptions/utils'); describe('GroupsListItem', () => { let wrapper; diff --git a/spec/frontend/jira_connect/components/groups_list_spec.js b/spec/frontend/jira_connect/subscriptions/components/groups_list_spec.js index d583fb68771..d3a9a3bfd41 100644 --- a/spec/frontend/jira_connect/components/groups_list_spec.js +++ b/spec/frontend/jira_connect/subscriptions/components/groups_list_spec.js @@ -2,10 +2,10 @@ import { GlAlert, GlLoadingIcon, GlSearchBoxByType, GlPagination } from '@gitlab import { shallowMount } from '@vue/test-utils'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; -import { fetchGroups } from '~/jira_connect/api'; -import GroupsList from '~/jira_connect/components/groups_list.vue'; -import GroupsListItem from '~/jira_connect/components/groups_list_item.vue'; -import { DEFAULT_GROUPS_PER_PAGE } from '~/jira_connect/constants'; +import { fetchGroups } from '~/jira_connect/subscriptions/api'; +import GroupsList from '~/jira_connect/subscriptions/components/groups_list.vue'; +import GroupsListItem from '~/jira_connect/subscriptions/components/groups_list_item.vue'; +import { DEFAULT_GROUPS_PER_PAGE } from '~/jira_connect/subscriptions/constants'; import { mockGroup1, mockGroup2 } from '../mock_data'; const createMockGroup = (groupId) => { @@ -19,7 +19,7 @@ const createMockGroups = (count) => { return [...new Array(count)].map((_, idx) => createMockGroup(idx)); }; -jest.mock('~/jira_connect/api', () => { +jest.mock('~/jira_connect/subscriptions/api', () => { return { fetchGroups: jest.fn(), }; diff --git a/spec/frontend/jira_connect/components/subscriptions_list_spec.js b/spec/frontend/jira_connect/subscriptions/components/subscriptions_list_spec.js index ff86969367d..32b43765843 100644 --- a/spec/frontend/jira_connect/components/subscriptions_list_spec.js +++ b/spec/frontend/jira_connect/subscriptions/components/subscriptions_list_spec.js @@ -2,14 +2,14 @@ import { GlButton, GlEmptyState, GlTable } from '@gitlab/ui'; import { mount, shallowMount } from '@vue/test-utils'; import waitForPromises from 'helpers/wait_for_promises'; -import * as JiraConnectApi from '~/jira_connect/api'; -import SubscriptionsList from '~/jira_connect/components/subscriptions_list.vue'; -import createStore from '~/jira_connect/store'; -import { SET_ALERT } from '~/jira_connect/store/mutation_types'; -import { reloadPage } from '~/jira_connect/utils'; +import * as JiraConnectApi from '~/jira_connect/subscriptions/api'; +import SubscriptionsList from '~/jira_connect/subscriptions/components/subscriptions_list.vue'; +import createStore from '~/jira_connect/subscriptions/store'; +import { SET_ALERT } from '~/jira_connect/subscriptions/store/mutation_types'; +import { reloadPage } from '~/jira_connect/subscriptions/utils'; import { mockSubscription } from '../mock_data'; -jest.mock('~/jira_connect/utils'); +jest.mock('~/jira_connect/subscriptions/utils'); describe('SubscriptionsList', () => { let wrapper; diff --git a/spec/frontend/jira_connect/index_spec.js b/spec/frontend/jira_connect/subscriptions/index_spec.js index 0161cfa0273..786f3b4a7d3 100644 --- a/spec/frontend/jira_connect/index_spec.js +++ b/spec/frontend/jira_connect/subscriptions/index_spec.js @@ -1,6 +1,6 @@ -import { initJiraConnect } from '~/jira_connect'; +import { initJiraConnect } from '~/jira_connect/subscriptions'; -jest.mock('~/jira_connect/utils', () => ({ +jest.mock('~/jira_connect/subscriptions/utils', () => ({ getLocation: jest.fn().mockResolvedValue('test/location'), })); diff --git a/spec/frontend/jira_connect/mock_data.js b/spec/frontend/jira_connect/subscriptions/mock_data.js index 5247a3dc522..5247a3dc522 100644 --- a/spec/frontend/jira_connect/mock_data.js +++ b/spec/frontend/jira_connect/subscriptions/mock_data.js diff --git a/spec/frontend/jira_connect/store/mutations_spec.js b/spec/frontend/jira_connect/subscriptions/store/mutations_spec.js index 584b17b36f7..84a33dbf0b5 100644 --- a/spec/frontend/jira_connect/store/mutations_spec.js +++ b/spec/frontend/jira_connect/subscriptions/store/mutations_spec.js @@ -1,5 +1,5 @@ -import mutations from '~/jira_connect/store/mutations'; -import state from '~/jira_connect/store/state'; +import mutations from '~/jira_connect/subscriptions/store/mutations'; +import state from '~/jira_connect/subscriptions/store/state'; describe('JiraConnect store mutations', () => { let localState; diff --git a/spec/frontend/jira_connect/utils_spec.js b/spec/frontend/jira_connect/subscriptions/utils_spec.js index 7eae870478d..2dd95de1b8c 100644 --- a/spec/frontend/jira_connect/utils_spec.js +++ b/spec/frontend/jira_connect/subscriptions/utils_spec.js @@ -1,6 +1,6 @@ import { useLocalStorageSpy } from 'helpers/local_storage_helper'; import { useMockLocationHelper } from 'helpers/mock_window_location_helper'; -import { ALERT_LOCALSTORAGE_KEY } from '~/jira_connect/constants'; +import { ALERT_LOCALSTORAGE_KEY } from '~/jira_connect/subscriptions/constants'; import { persistAlert, retrieveAlert, @@ -8,7 +8,7 @@ import { getLocation, reloadPage, sizeToParent, -} from '~/jira_connect/utils'; +} from '~/jira_connect/subscriptions/utils'; describe('JiraConnect utils', () => { describe('alert utils', () => { |