From 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 18 Feb 2021 10:34:06 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-9-stable-ee --- .../releases/stores/modules/detail/actions_spec.js | 14 +++++++------- .../releases/stores/modules/detail/mutations_spec.js | 6 +++--- .../releases/stores/modules/list/actions_spec.js | 20 ++++++++++---------- .../releases/stores/modules/list/mutations_spec.js | 8 ++++---- 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'spec/frontend/releases/stores') diff --git a/spec/frontend/releases/stores/modules/detail/actions_spec.js b/spec/frontend/releases/stores/modules/detail/actions_spec.js index 396e7bd8745..9c125fbb87b 100644 --- a/spec/frontend/releases/stores/modules/detail/actions_spec.js +++ b/spec/frontend/releases/stores/modules/detail/actions_spec.js @@ -1,17 +1,17 @@ import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; -import testAction from 'helpers/vuex_action_helper'; -import { getJSONFixture } from 'helpers/fixtures'; import { cloneDeep } from 'lodash'; -import * as actions from '~/releases/stores/modules/detail/actions'; -import * as types from '~/releases/stores/modules/detail/mutation_types'; -import createState from '~/releases/stores/modules/detail/state'; +import { getJSONFixture } from 'helpers/fixtures'; +import testAction from 'helpers/vuex_action_helper'; +import api from '~/api'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import { redirectTo } from '~/lib/utils/url_utility'; -import api from '~/api'; import httpStatus from '~/lib/utils/http_status'; +import { redirectTo } from '~/lib/utils/url_utility'; import { ASSET_LINK_TYPE } from '~/releases/constants'; +import * as actions from '~/releases/stores/modules/detail/actions'; +import * as types from '~/releases/stores/modules/detail/mutation_types'; +import createState from '~/releases/stores/modules/detail/state'; import { releaseToApiJson, apiJsonToRelease } from '~/releases/util'; jest.mock('~/flash'); diff --git a/spec/frontend/releases/stores/modules/detail/mutations_spec.js b/spec/frontend/releases/stores/modules/detail/mutations_spec.js index 88eddc4019c..cdf26bfa834 100644 --- a/spec/frontend/releases/stores/modules/detail/mutations_spec.js +++ b/spec/frontend/releases/stores/modules/detail/mutations_spec.js @@ -1,9 +1,9 @@ import { getJSONFixture } from 'helpers/fixtures'; -import createState from '~/releases/stores/modules/detail/state'; -import mutations from '~/releases/stores/modules/detail/mutations'; -import * as types from '~/releases/stores/modules/detail/mutation_types'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { ASSET_LINK_TYPE, DEFAULT_ASSET_LINK_TYPE } from '~/releases/constants'; +import * as types from '~/releases/stores/modules/detail/mutation_types'; +import mutations from '~/releases/stores/modules/detail/mutations'; +import createState from '~/releases/stores/modules/detail/state'; const originalRelease = getJSONFixture('api/releases/release.json'); diff --git a/spec/frontend/releases/stores/modules/list/actions_spec.js b/spec/frontend/releases/stores/modules/list/actions_spec.js index 35551b77dc4..309f7387929 100644 --- a/spec/frontend/releases/stores/modules/list/actions_spec.js +++ b/spec/frontend/releases/stores/modules/list/actions_spec.js @@ -1,6 +1,14 @@ import { cloneDeep } from 'lodash'; -import testAction from 'helpers/vuex_action_helper'; import { getJSONFixture } from 'helpers/fixtures'; +import testAction from 'helpers/vuex_action_helper'; +import api from '~/api'; +import { + normalizeHeaders, + parseIntPagination, + convertObjectPropsToCamelCase, +} from '~/lib/utils/common_utils'; +import { PAGE_SIZE } from '~/releases/constants'; +import allReleasesQuery from '~/releases/queries/all_releases.query.graphql'; import { fetchReleases, fetchReleasesGraphQl, @@ -8,18 +16,10 @@ import { receiveReleasesError, setSorting, } from '~/releases/stores/modules/list/actions'; -import createState from '~/releases/stores/modules/list/state'; import * as types from '~/releases/stores/modules/list/mutation_types'; -import api from '~/api'; +import createState from '~/releases/stores/modules/list/state'; import { gqClient, convertAllReleasesGraphQLResponse } from '~/releases/util'; -import { - normalizeHeaders, - parseIntPagination, - convertObjectPropsToCamelCase, -} from '~/lib/utils/common_utils'; import { pageInfoHeadersWithoutPagination } from '../../../mock_data'; -import allReleasesQuery from '~/releases/queries/all_releases.query.graphql'; -import { PAGE_SIZE } from '~/releases/constants'; const originalRelease = getJSONFixture('api/releases/release.json'); const originalReleases = [originalRelease]; diff --git a/spec/frontend/releases/stores/modules/list/mutations_spec.js b/spec/frontend/releases/stores/modules/list/mutations_spec.js index 78071573072..ea6a4ada16a 100644 --- a/spec/frontend/releases/stores/modules/list/mutations_spec.js +++ b/spec/frontend/releases/stores/modules/list/mutations_spec.js @@ -1,10 +1,10 @@ import { getJSONFixture } from 'helpers/fixtures'; -import createState from '~/releases/stores/modules/list/state'; -import mutations from '~/releases/stores/modules/list/mutations'; -import * as types from '~/releases/stores/modules/list/mutation_types'; import { parseIntPagination, convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import { pageInfoHeadersWithoutPagination } from '../../../mock_data'; +import * as types from '~/releases/stores/modules/list/mutation_types'; +import mutations from '~/releases/stores/modules/list/mutations'; +import createState from '~/releases/stores/modules/list/state'; import { convertAllReleasesGraphQLResponse } from '~/releases/util'; +import { pageInfoHeadersWithoutPagination } from '../../../mock_data'; const originalRelease = getJSONFixture('api/releases/release.json'); const originalReleases = [originalRelease]; -- cgit v1.2.1