diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
| commit | d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb (patch) | |
| tree | 2341ef426af70ad1e289c38036737e04b0aa5007 /spec/frontend_integration | |
| parent | d6e514dd13db8947884cd58fe2a9c2a063400a9b (diff) | |
Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42
Diffstat (limited to 'spec/frontend_integration')
| -rw-r--r-- | spec/frontend_integration/fixture_generators.yml | 5 | ||||
| -rw-r--r-- | spec/frontend_integration/test_helpers/mock_server/graphql.js | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/spec/frontend_integration/fixture_generators.yml b/spec/frontend_integration/fixture_generators.yml new file mode 100644 index 00000000000..1f6ff85352d --- /dev/null +++ b/spec/frontend_integration/fixture_generators.yml @@ -0,0 +1,5 @@ +- spec/frontend/fixtures/api_projects.rb +- spec/frontend/fixtures/api_merge_requests.rb +- spec/frontend/fixtures/projects_json.rb +- spec/frontend/fixtures/merge_requests_diffs.rb +- spec/frontend/fixtures/raw.rb diff --git a/spec/frontend_integration/test_helpers/mock_server/graphql.js b/spec/frontend_integration/test_helpers/mock_server/graphql.js index 27396842523..d4ee7c02839 100644 --- a/spec/frontend_integration/test_helpers/mock_server/graphql.js +++ b/spec/frontend_integration/test_helpers/mock_server/graphql.js @@ -1,9 +1,7 @@ import { buildSchema, graphql } from 'graphql'; import { memoize } from 'lodash'; -// The graphql schema is dynamically generated in CI -// during the `graphql-schema-dump` job. -// eslint-disable-next-line global-require, import/no-unresolved +// eslint-disable-next-line global-require const getGraphqlSchema = () => require('../../../../tmp/tests/graphql/gitlab_schema.graphql'); const graphqlResolvers = { |