diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 18:09:37 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 18:09:37 +0300 |
commit | a210c43e0aca0311cc1d3d381763b25979ec72dc (patch) | |
tree | 0325d173da7a6e7bd6c2cdf450d0aa1c4e142d0f /spec/javascripts | |
parent | c9687bdf58e9d4a9c3942f587bd4841f42e3b5de (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/blob/balsamiq/balsamiq_viewer_browser_spec.js (renamed from spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js) | 2 | ||||
-rw-r--r-- | spec/javascripts/blob/sketch/index_spec.js | 120 |
2 files changed, 2 insertions, 120 deletions
diff --git a/spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js b/spec/javascripts/blob/balsamiq/balsamiq_viewer_browser_spec.js index 0c2b7b7392d..4e06e5c12fc 100644 --- a/spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js +++ b/spec/javascripts/blob/balsamiq/balsamiq_viewer_browser_spec.js @@ -1,3 +1,5 @@ +// this file can't be migrated to jest because it relies on the browser to perform integration tests: +// see: https://gitlab.com/gitlab-org/gitlab/-/issues/194207#note_301878738 import { FIXTURES_PATH } from 'spec/test_constants'; import BalsamiqViewer from '~/blob/balsamiq/balsamiq_viewer'; diff --git a/spec/javascripts/blob/sketch/index_spec.js b/spec/javascripts/blob/sketch/index_spec.js deleted file mode 100644 index 3d3129e10da..00000000000 --- a/spec/javascripts/blob/sketch/index_spec.js +++ /dev/null @@ -1,120 +0,0 @@ -/* eslint-disable no-new, promise/catch-or-return */ -import JSZip from 'jszip'; -import SketchLoader from '~/blob/sketch'; - -describe('Sketch viewer', () => { - const generateZipFileArrayBuffer = (zipFile, resolve, done) => { - zipFile.generateAsync({ type: 'arrayBuffer' }).then(content => { - resolve(content); - - setTimeout(() => { - done(); - }, 100); - }); - }; - - preloadFixtures('static/sketch_viewer.html'); - - beforeEach(() => { - loadFixtures('static/sketch_viewer.html'); - }); - - describe('with error message', () => { - beforeEach(done => { - spyOn(SketchLoader.prototype, 'getZipFile').and.callFake( - () => - new Promise((resolve, reject) => { - reject(); - - setTimeout(() => { - done(); - }); - }), - ); - - new SketchLoader(document.getElementById('js-sketch-viewer')); - }); - - it('renders error message', () => { - expect(document.querySelector('#js-sketch-viewer p')).not.toBeNull(); - - expect(document.querySelector('#js-sketch-viewer p').textContent.trim()).toContain( - 'Cannot show preview.', - ); - }); - - it('removes render the loading icon', () => { - expect(document.querySelector('.js-loading-icon')).toBeNull(); - }); - }); - - describe('success', () => { - beforeEach(done => { - spyOn(SketchLoader.prototype, 'getZipFile').and.callFake( - () => - new Promise(resolve => { - const zipFile = new JSZip(); - zipFile - .folder('previews') - .file( - 'preview.png', - 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAMAAAAoyzS7AAAAA1BMVEUAAACnej3aAAAAAXRSTlMAQObYZgAAAA1JREFUeNoBAgD9/wAAAAIAAVMrnDAAAAAASUVORK5CYII=', - { - base64: true, - }, - ); - - generateZipFileArrayBuffer(zipFile, resolve, done); - }), - ); - - new SketchLoader(document.getElementById('js-sketch-viewer')); - }); - - it('does not render error message', () => { - expect(document.querySelector('#js-sketch-viewer p')).toBeNull(); - }); - - it('removes render the loading icon', () => { - expect(document.querySelector('.js-loading-icon')).toBeNull(); - }); - - it('renders preview img', () => { - const img = document.querySelector('#js-sketch-viewer img'); - - expect(img).not.toBeNull(); - expect(img.classList.contains('img-fluid')).toBeTruthy(); - }); - - it('renders link to image', () => { - const img = document.querySelector('#js-sketch-viewer img'); - const link = document.querySelector('#js-sketch-viewer a'); - - expect(link.href).toBe(img.src); - expect(link.target).toBe('_blank'); - }); - }); - - describe('incorrect file', () => { - beforeEach(done => { - spyOn(SketchLoader.prototype, 'getZipFile').and.callFake( - () => - new Promise(resolve => { - const zipFile = new JSZip(); - - generateZipFileArrayBuffer(zipFile, resolve, done); - }), - ); - - new SketchLoader(document.getElementById('js-sketch-viewer')); - }); - - it('renders error message', () => { - expect(document.querySelector('#js-sketch-viewer p')).not.toBeNull(); - - expect(document.querySelector('#js-sketch-viewer p').textContent.trim()).toContain( - 'Cannot show preview.', - ); - }); - }); -}); |