diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-14 15:14:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-14 15:14:02 +0300 |
| commit | 2896c7471aa75a7842fe6318a122f83ca6c211bb (patch) | |
| tree | 5da5605d7632d654cf70a3bbfbf32dc12178fa04 /spec/frontend/import_entities | |
| parent | 41482e5dce6765dc2ec019da1c652061fc8d8f83 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/import_entities')
| -rw-r--r-- | spec/frontend/import_entities/import_groups/graphql/client_factory_spec.js | 2 | ||||
| -rw-r--r-- | spec/frontend/import_entities/import_groups/graphql/fixtures.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/frontend/import_entities/import_groups/graphql/client_factory_spec.js b/spec/frontend/import_entities/import_groups/graphql/client_factory_spec.js index c6ddce17fe4..52c868e5356 100644 --- a/spec/frontend/import_entities/import_groups/graphql/client_factory_spec.js +++ b/spec/frontend/import_entities/import_groups/graphql/client_factory_spec.js @@ -1,4 +1,4 @@ -import { InMemoryCache } from 'apollo-cache-inmemory'; +import { InMemoryCache } from '@apollo/client/core'; import MockAdapter from 'axios-mock-adapter'; import { createMockClient } from 'mock-apollo-client'; import waitForPromises from 'helpers/wait_for_promises'; diff --git a/spec/frontend/import_entities/import_groups/graphql/fixtures.js b/spec/frontend/import_entities/import_groups/graphql/fixtures.js index ed4e343f331..938020e03f0 100644 --- a/spec/frontend/import_entities/import_groups/graphql/fixtures.js +++ b/spec/frontend/import_entities/import_groups/graphql/fixtures.js @@ -16,6 +16,7 @@ export const generateFakeEntry = ({ id, status, message, ...rest }) => ({ status === STATUSES.NONE || status === STATUSES.PENDING ? null : { + __typename: clientTypenames.BulkImportProgress, id, status, message: message || '', |