diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-07-08 06:51:25 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-07-08 06:51:25 +0000 |
| commit | 008aa6af4fa6a874bc893e214907a0ea1afb17f5 (patch) | |
| tree | c2e40d5cec05d0577fcccc150317b147a4da04a0 /spec/frontend | |
| parent | 59e62c0a821089b22cbf5edf30c8cd516c88f1b2 (diff) | |
| parent | ff1a4a4241f1628491a1aec05b440ff650ba66ad (diff) | |
| download | gitlab-ce-winh-does-jest-fail.tar.gz | |
Merge branch '60856-deleting-binary-file' into 'master'winh-does-jest-fail
Resolve "Removing an image via Web IDE shows binary data"
Closes #60856
See merge request gitlab-org/gitlab-ce!30314
Diffstat (limited to 'spec/frontend')
| -rw-r--r-- | spec/frontend/ide/lib/files_spec.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/frontend/ide/lib/files_spec.js b/spec/frontend/ide/lib/files_spec.js index aa1fa0373db..08a31318544 100644 --- a/spec/frontend/ide/lib/files_spec.js +++ b/spec/frontend/ide/lib/files_spec.js @@ -12,6 +12,7 @@ const createEntries = paths => { const { name, parent } = splitParent(path); const parentEntry = acc[parent]; + const previewMode = viewerInformationForPath(name); acc[path] = { ...decorateData({ @@ -22,7 +23,8 @@ const createEntries = paths => { path, url: createUrl(`/${TEST_PROJECT_ID}/${type}/${TEST_BRANCH_ID}/-/${escapeFileUrl(path)}`), type, - previewMode: viewerInformationForPath(path), + previewMode, + binary: (previewMode && previewMode.binary) || false, parentPath: parent, parentTreeUrl: parentEntry ? parentEntry.url |