From f666026d71ebefd70219d5078b1f0c83fa01f84d Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Wed, 17 Oct 2018 02:13:26 -0500 Subject: Prettify all spec files --- .../javascripts/blob/3d_viewer/mesh_object_spec.js | 20 +--- .../balsamiq/balsamiq_viewer_integration_spec.js | 14 ++- .../blob/balsamiq/balsamiq_viewer_spec.js | 18 ++-- spec/javascripts/blob/blob_file_dropzone_spec.js | 2 +- spec/javascripts/blob/blob_fork_suggestion_spec.js | 3 +- spec/javascripts/blob/notebook/index_spec.js | 86 +++++++--------- spec/javascripts/blob/pdf/index_spec.js | 32 +++--- spec/javascripts/blob/sketch/index_spec.js | 108 +++++++++++---------- spec/javascripts/blob/viewer/index_spec.js | 47 ++++----- 9 files changed, 148 insertions(+), 182 deletions(-) (limited to 'spec/javascripts/blob') diff --git a/spec/javascripts/blob/3d_viewer/mesh_object_spec.js b/spec/javascripts/blob/3d_viewer/mesh_object_spec.js index 7651792be2e..60be285039f 100644 --- a/spec/javascripts/blob/3d_viewer/mesh_object_spec.js +++ b/spec/javascripts/blob/3d_viewer/mesh_object_spec.js @@ -1,21 +1,15 @@ -import { - BoxGeometry, -} from 'three/build/three.module'; +import { BoxGeometry } from 'three/build/three.module'; import MeshObject from '~/blob/3d_viewer/mesh_object'; describe('Mesh object', () => { it('defaults to non-wireframe material', () => { - const object = new MeshObject( - new BoxGeometry(10, 10, 10), - ); + const object = new MeshObject(new BoxGeometry(10, 10, 10)); expect(object.material.wireframe).toBeFalsy(); }); it('changes to wirefame material', () => { - const object = new MeshObject( - new BoxGeometry(10, 10, 10), - ); + const object = new MeshObject(new BoxGeometry(10, 10, 10)); object.changeMaterial('wireframe'); @@ -23,18 +17,14 @@ describe('Mesh object', () => { }); it('scales object down', () => { - const object = new MeshObject( - new BoxGeometry(10, 10, 10), - ); + const object = new MeshObject(new BoxGeometry(10, 10, 10)); const { radius } = object.geometry.boundingSphere; expect(radius).not.toBeGreaterThan(4); }); it('does not scale object down', () => { - const object = new MeshObject( - new BoxGeometry(1, 1, 1), - ); + const object = new MeshObject(new BoxGeometry(1, 1, 1)); const { radius } = object.geometry.boundingSphere; expect(radius).toBeLessThan(1); diff --git a/spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js b/spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js index c726fa8e428..5f027f59fcf 100644 --- a/spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js +++ b/spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js @@ -16,10 +16,13 @@ describe('Balsamiq integration spec', () => { }); describe('successful response', () => { - beforeEach((done) => { + beforeEach(done => { endpoint = bmprPath; - balsamiqViewer.loadFile(endpoint).then(done).catch(done.fail); + balsamiqViewer + .loadFile(endpoint) + .then(done) + .catch(done.fail); }); it('does not show loading icon', () => { @@ -32,10 +35,13 @@ describe('Balsamiq integration spec', () => { }); describe('error getting file', () => { - beforeEach((done) => { + beforeEach(done => { endpoint = 'invalid/path/to/file.bmpr'; - balsamiqViewer.loadFile(endpoint).then(done.fail, null).catch(done); + balsamiqViewer + .loadFile(endpoint) + .then(done.fail, null) + .catch(done); }); it('does not show loading icon', () => { diff --git a/spec/javascripts/blob/balsamiq/balsamiq_viewer_spec.js b/spec/javascripts/blob/balsamiq/balsamiq_viewer_spec.js index cb0f2ba686d..9270433dcb7 100644 --- a/spec/javascripts/blob/balsamiq/balsamiq_viewer_spec.js +++ b/spec/javascripts/blob/balsamiq/balsamiq_viewer_spec.js @@ -18,9 +18,7 @@ describe('BalsamiqViewer', () => { }); }); - describe('fileLoaded', () => { - - }); + describe('fileLoaded', () => {}); describe('loadFile', () => { let xhr; @@ -64,12 +62,16 @@ describe('BalsamiqViewer', () => { viewer = jasmine.createSpyObj('viewer', ['appendChild']); previews = [document.createElement('ul'), document.createElement('ul')]; - balsamiqViewer = jasmine.createSpyObj('balsamiqViewer', ['initDatabase', 'getPreviews', 'renderPreview']); + balsamiqViewer = jasmine.createSpyObj('balsamiqViewer', [ + 'initDatabase', + 'getPreviews', + 'renderPreview', + ]); balsamiqViewer.viewer = viewer; balsamiqViewer.getPreviews.and.returnValue(previews); balsamiqViewer.renderPreview.and.callFake(preview => preview); - viewer.appendChild.and.callFake((containerElement) => { + viewer.appendChild.and.callFake(containerElement => { container = containerElement; }); @@ -198,7 +200,9 @@ describe('BalsamiqViewer', () => { }); it('should call database.exec', () => { - expect(database.exec).toHaveBeenCalledWith(`SELECT * FROM resources WHERE id = '${resourceID}'`); + expect(database.exec).toHaveBeenCalledWith( + `SELECT * FROM resources WHERE id = '${resourceID}'`, + ); }); it('should return the selected resource', () => { @@ -281,7 +285,7 @@ describe('BalsamiqViewer', () => { expect(BalsamiqViewer.parseTitle).toHaveBeenCalledWith(resource); }); - it('should return the template string', function () { + it('should return the template string', function() { expect(renderTemplate.replace(/\s/g, '')).toEqual(template.replace(/\s/g, '')); }); }); diff --git a/spec/javascripts/blob/blob_file_dropzone_spec.js b/spec/javascripts/blob/blob_file_dropzone_spec.js index 346f795c3f5..432d8a65b0a 100644 --- a/spec/javascripts/blob/blob_file_dropzone_spec.js +++ b/spec/javascripts/blob/blob_file_dropzone_spec.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import BlobFileDropzone from '~/blob/blob_file_dropzone'; -describe('BlobFileDropzone', function () { +describe('BlobFileDropzone', function() { preloadFixtures('blob/show.html.raw'); beforeEach(() => { diff --git a/spec/javascripts/blob/blob_fork_suggestion_spec.js b/spec/javascripts/blob/blob_fork_suggestion_spec.js index fa40a04a8c7..9b81b7e6f92 100644 --- a/spec/javascripts/blob/blob_fork_suggestion_spec.js +++ b/spec/javascripts/blob/blob_fork_suggestion_spec.js @@ -16,8 +16,7 @@ describe('BlobForkSuggestion', () => { cancelButtons: cancelButton, suggestionSections: suggestionSection, actionTextPieces: actionTextPiece, - }) - .init(); + }).init(); }); afterEach(() => { diff --git a/spec/javascripts/blob/notebook/index_spec.js b/spec/javascripts/blob/notebook/index_spec.js index 80c09a544d6..28d3b2f5ea3 100644 --- a/spec/javascripts/blob/notebook/index_spec.js +++ b/spec/javascripts/blob/notebook/index_spec.js @@ -12,29 +12,27 @@ describe('iPython notebook renderer', () => { it('shows loading icon', () => { renderNotebook(); - expect( - document.querySelector('.loading'), - ).not.toBeNull(); + expect(document.querySelector('.loading')).not.toBeNull(); }); describe('successful response', () => { let mock; - beforeEach((done) => { + beforeEach(done => { mock = new MockAdapter(axios); mock.onGet('/test').reply(200, { - cells: [{ - cell_type: 'markdown', - source: ['# test'], - }, { - cell_type: 'code', - execution_count: 1, - source: [ - 'def test(str)', - ' return str', - ], - outputs: [], - }], + cells: [ + { + cell_type: 'markdown', + source: ['# test'], + }, + { + cell_type: 'code', + execution_count: 1, + source: ['def test(str)', ' return str'], + outputs: [], + }, + ], }); renderNotebook(); @@ -49,35 +47,23 @@ describe('iPython notebook renderer', () => { }); it('does not show loading icon', () => { - expect( - document.querySelector('.loading'), - ).toBeNull(); + expect(document.querySelector('.loading')).toBeNull(); }); it('renders the notebook', () => { - expect( - document.querySelector('.md'), - ).not.toBeNull(); + expect(document.querySelector('.md')).not.toBeNull(); }); it('renders the markdown cell', () => { - expect( - document.querySelector('h1'), - ).not.toBeNull(); + expect(document.querySelector('h1')).not.toBeNull(); - expect( - document.querySelector('h1').textContent.trim(), - ).toBe('test'); + expect(document.querySelector('h1').textContent.trim()).toBe('test'); }); it('highlights code', () => { - expect( - document.querySelector('.token'), - ).not.toBeNull(); + expect(document.querySelector('.token')).not.toBeNull(); - expect( - document.querySelector('.language-python'), - ).not.toBeNull(); + expect(document.querySelector('.language-python')).not.toBeNull(); }); }); @@ -86,12 +72,10 @@ describe('iPython notebook renderer', () => { beforeEach(done => { mock = new MockAdapter(axios); - mock - .onGet('/test') - .reply(() => - // eslint-disable-next-line prefer-promise-reject-errors - Promise.reject({ status: 200, data: '{ "cells": [{"cell_type": "markdown"} }' }), - ); + mock.onGet('/test').reply(() => + // eslint-disable-next-line prefer-promise-reject-errors + Promise.reject({ status: 200, data: '{ "cells": [{"cell_type": "markdown"} }' }), + ); renderNotebook(); @@ -105,22 +89,20 @@ describe('iPython notebook renderer', () => { }); it('does not show loading icon', () => { - expect( - document.querySelector('.loading'), - ).toBeNull(); + expect(document.querySelector('.loading')).toBeNull(); }); it('shows error message', () => { - expect( - document.querySelector('.md').textContent.trim(), - ).toBe('An error occurred whilst parsing the file.'); + expect(document.querySelector('.md').textContent.trim()).toBe( + 'An error occurred whilst parsing the file.', + ); }); }); describe('error getting file', () => { let mock; - beforeEach((done) => { + beforeEach(done => { mock = new MockAdapter(axios); mock.onGet('/test').reply(500, ''); @@ -136,15 +118,13 @@ describe('iPython notebook renderer', () => { }); it('does not show loading icon', () => { - expect( - document.querySelector('.loading'), - ).toBeNull(); + expect(document.querySelector('.loading')).toBeNull(); }); it('shows error message', () => { - expect( - document.querySelector('.md').textContent.trim(), - ).toBe('An error occurred whilst loading the file. Please try again later.'); + expect(document.querySelector('.md').textContent.trim()).toBe( + 'An error occurred whilst loading the file. Please try again later.', + ); }); }); }); diff --git a/spec/javascripts/blob/pdf/index_spec.js b/spec/javascripts/blob/pdf/index_spec.js index bbe2500f8e3..be917a0613f 100644 --- a/spec/javascripts/blob/pdf/index_spec.js +++ b/spec/javascripts/blob/pdf/index_spec.js @@ -5,7 +5,7 @@ describe('PDF renderer', () => { let viewer; let app; - const checkLoaded = (done) => { + const checkLoaded = done => { if (app.loading) { setTimeout(() => { checkLoaded(done); @@ -26,39 +26,31 @@ describe('PDF renderer', () => { it('shows loading icon', () => { renderPDF(); - expect( - document.querySelector('.loading'), - ).not.toBeNull(); + expect(document.querySelector('.loading')).not.toBeNull(); }); describe('successful response', () => { - beforeEach((done) => { + beforeEach(done => { app = renderPDF(); checkLoaded(done); }); it('does not show loading icon', () => { - expect( - document.querySelector('.loading'), - ).toBeNull(); + expect(document.querySelector('.loading')).toBeNull(); }); it('renders the PDF', () => { - expect( - document.querySelector('.pdf-viewer'), - ).not.toBeNull(); + expect(document.querySelector('.pdf-viewer')).not.toBeNull(); }); it('renders the PDF page', () => { - expect( - document.querySelector('.pdf-page'), - ).not.toBeNull(); + expect(document.querySelector('.pdf-page')).not.toBeNull(); }); }); describe('error getting file', () => { - beforeEach((done) => { + beforeEach(done => { viewer.dataset.endpoint = 'invalid/path/to/file.pdf'; app = renderPDF(); @@ -66,15 +58,13 @@ describe('PDF renderer', () => { }); it('does not show loading icon', () => { - expect( - document.querySelector('.loading'), - ).toBeNull(); + expect(document.querySelector('.loading')).toBeNull(); }); it('shows error message', () => { - expect( - document.querySelector('.md').textContent.trim(), - ).toBe('An error occurred whilst loading the file. Please try again later.'); + expect(document.querySelector('.md').textContent.trim()).toBe( + 'An error occurred whilst loading the file. Please try again later.', + ); }); }); }); diff --git a/spec/javascripts/blob/sketch/index_spec.js b/spec/javascripts/blob/sketch/index_spec.js index e062a068a92..2b1e81e9cbc 100644 --- a/spec/javascripts/blob/sketch/index_spec.js +++ b/spec/javascripts/blob/sketch/index_spec.js @@ -4,15 +4,13 @@ import SketchLoader from '~/blob/sketch'; describe('Sketch viewer', () => { const generateZipFileArrayBuffer = (zipFile, resolve, done) => { - zipFile - .generateAsync({ type: 'arrayBuffer' }) - .then((content) => { - resolve(content); - - setTimeout(() => { - done(); - }, 100); - }); + zipFile.generateAsync({ type: 'arrayBuffer' }).then(content => { + resolve(content); + + setTimeout(() => { + done(); + }, 100); + }); }; preloadFixtures('static/sketch_viewer.html.raw'); @@ -22,60 +20,63 @@ describe('Sketch viewer', () => { }); describe('with error message', () => { - beforeEach((done) => { - spyOn(SketchLoader.prototype, 'getZipFile').and.callFake(() => new Promise((resolve, reject) => { - reject(); - - setTimeout(() => { - done(); - }); - })); + 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')).not.toBeNull(); - expect( - document.querySelector('#js-sketch-viewer p').textContent.trim(), - ).toContain('Cannot show preview.'); + 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(); + 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); - })); + 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(); + expect(document.querySelector('#js-sketch-viewer p')).toBeNull(); }); it('removes render the loading icon', () => { - expect( - document.querySelector('.js-loading-icon'), - ).toBeNull(); + expect(document.querySelector('.js-loading-icon')).toBeNull(); }); it('renders preview img', () => { @@ -95,24 +96,25 @@ describe('Sketch viewer', () => { }); describe('incorrect file', () => { - beforeEach((done) => { - spyOn(SketchLoader.prototype, 'getZipFile').and.callFake(() => new Promise((resolve) => { - const zipFile = new JSZip(); + beforeEach(done => { + spyOn(SketchLoader.prototype, 'getZipFile').and.callFake( + () => + new Promise(resolve => { + const zipFile = new JSZip(); - generateZipFileArrayBuffer(zipFile, resolve, done); - })); + 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')).not.toBeNull(); - expect( - document.querySelector('#js-sketch-viewer p').textContent.trim(), - ).toContain('Cannot show preview.'); + expect(document.querySelector('#js-sketch-viewer p').textContent.trim()).toContain( + 'Cannot show preview.', + ); }); }); }); diff --git a/spec/javascripts/blob/viewer/index_spec.js b/spec/javascripts/blob/viewer/index_spec.js index b5a9db2da3a..93a942fe8d4 100644 --- a/spec/javascripts/blob/viewer/index_spec.js +++ b/spec/javascripts/blob/viewer/index_spec.js @@ -35,12 +35,13 @@ describe('Blob viewer', () => { window.location.hash = ''; }); - it('loads source file after switching views', (done) => { + it('loads source file after switching views', done => { document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]').click(); setTimeout(() => { expect( - document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]') + document + .querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]') .classList.contains('hidden'), ).toBeFalsy(); @@ -48,14 +49,15 @@ describe('Blob viewer', () => { }); }); - it('loads source file when line number is in hash', (done) => { + it('loads source file when line number is in hash', done => { window.location.hash = '#L1'; new BlobViewer(); setTimeout(() => { expect( - document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]') + document + .querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]') .classList.contains('hidden'), ).toBeFalsy(); @@ -63,12 +65,13 @@ describe('Blob viewer', () => { }); }); - it('doesnt reload file if already loaded', (done) => { - const asyncClick = () => new Promise((resolve) => { - document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]').click(); + it('doesnt reload file if already loaded', done => { + const asyncClick = () => + new Promise(resolve => { + document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]').click(); - setTimeout(resolve); - }); + setTimeout(resolve); + }); asyncClick() .then(() => asyncClick()) @@ -93,15 +96,13 @@ describe('Blob viewer', () => { }); it('disabled on load', () => { - expect( - copyButton.classList.contains('disabled'), - ).toBeTruthy(); + expect(copyButton.classList.contains('disabled')).toBeTruthy(); }); it('has tooltip when disabled', () => { - expect( - copyButton.getAttribute('data-original-title'), - ).toBe('Switch to the source to copy it to the clipboard'); + expect(copyButton.getAttribute('data-original-title')).toBe( + 'Switch to the source to copy it to the clipboard', + ); }); it('is blurred when clicked and disabled', () => { @@ -121,25 +122,21 @@ describe('Blob viewer', () => { expect(copyButton.blur).not.toHaveBeenCalled(); }); - it('enables after switching to simple view', (done) => { + it('enables after switching to simple view', done => { document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]').click(); setTimeout(() => { - expect( - copyButton.classList.contains('disabled'), - ).toBeFalsy(); + expect(copyButton.classList.contains('disabled')).toBeFalsy(); done(); }); }); - it('updates tooltip after switching to simple view', (done) => { + it('updates tooltip after switching to simple view', done => { document.querySelector('.js-blob-viewer-switch-btn[data-viewer="simple"]').click(); setTimeout(() => { - expect( - copyButton.getAttribute('data-original-title'), - ).toBe('Copy source to clipboard'); + expect(copyButton.getAttribute('data-original-title')).toBe('Copy source to clipboard'); done(); }); @@ -162,9 +159,7 @@ describe('Blob viewer', () => { blob.switchToViewer('simple'); - expect( - simpleBtn.classList.contains('active'), - ).toBeTruthy(); + expect(simpleBtn.classList.contains('active')).toBeTruthy(); expect(simpleBtn.blur).toHaveBeenCalled(); }); -- cgit v1.2.1