diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
| commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
| tree | c8f718a08e110ad7e1894510980d2155a6549197 /spec/frontend_integration | |
| parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
| download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'spec/frontend_integration')
| -rw-r--r-- | spec/frontend_integration/ide/__snapshots__/ide_integration_spec.js.snap | 22 | ||||
| -rw-r--r-- | spec/frontend_integration/test_helpers/fixtures.js | 2 |
2 files changed, 1 insertions, 23 deletions
diff --git a/spec/frontend_integration/ide/__snapshots__/ide_integration_spec.js.snap b/spec/frontend_integration/ide/__snapshots__/ide_integration_spec.js.snap index 6c120898f01..877cc78a111 100644 --- a/spec/frontend_integration/ide/__snapshots__/ide_integration_spec.js.snap +++ b/spec/frontend_integration/ide/__snapshots__/ide_integration_spec.js.snap @@ -9,12 +9,6 @@ exports[`WebIDE runs 1`] = ` class="ide-view flex-grow d-flex" > <div - class="file-finder-overlay" - style="display: none;" - > - (jest: contents hidden) - </div> - <div class="gl-relative multi-file-commit-panel flex-column" style="width: 340px;" > @@ -109,28 +103,12 @@ exports[`WebIDE runs 1`] = ` <h4> Make and review changes in the browser with the Web IDE </h4> - <div - class="gl-spinner-container" - > - <span - aria-label="Loading" - class="align-text-bottom gl-spinner gl-spinner-orange gl-spinner-md" - /> - </div> </div> </div> </div> </div> </div> </div> - <footer - class="ide-status-bar" - > - <div - class="ide-status-list d-flex ml-auto" - > - </div> - </footer> </article> </div> `; diff --git a/spec/frontend_integration/test_helpers/fixtures.js b/spec/frontend_integration/test_helpers/fixtures.js index 5f9c0e8dcba..50fa4859dfa 100644 --- a/spec/frontend_integration/test_helpers/fixtures.js +++ b/spec/frontend_integration/test_helpers/fixtures.js @@ -1,4 +1,4 @@ -/* eslint-disable global-require */ +/* eslint-disable global-require, import/no-unresolved */ import { memoize } from 'lodash'; export const getProject = () => require('test_fixtures/api/projects/get.json'); |