diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-03-22 14:03:15 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-03-22 14:03:15 +0300 |
commit | 022968764ced43c5de0c3291cfe2fbc7b068e944 (patch) | |
tree | f8e35bc8b582ecabb7d0b8e559c652fe0ede8262 /spec/javascripts/blob | |
parent | 685a85c6132fbd1f9e5ace08bd4b2808f3a50a8b (diff) |
Revert "Merge branch 'winh-remove-sushi' into 'master'"
This reverts merge request !26430
Diffstat (limited to 'spec/javascripts/blob')
-rw-r--r-- | spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js | 4 | ||||
-rw-r--r-- | spec/javascripts/blob/blob_file_dropzone_spec.js | 4 | ||||
-rw-r--r-- | spec/javascripts/blob/notebook/index_spec.js | 4 | ||||
-rw-r--r-- | spec/javascripts/blob/pdf/index_spec.js | 4 | ||||
-rw-r--r-- | spec/javascripts/blob/sketch/index_spec.js | 4 | ||||
-rw-r--r-- | spec/javascripts/blob/viewer/index_spec.js | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js b/spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js index 68b4f261617..5f027f59fcf 100644 --- a/spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js +++ b/spec/javascripts/blob/balsamiq/balsamiq_viewer_integration_spec.js @@ -6,10 +6,10 @@ describe('Balsamiq integration spec', () => { let endpoint; let balsamiqViewer; - preloadFixtures('static/balsamiq_viewer.html'); + preloadFixtures('static/balsamiq_viewer.html.raw'); beforeEach(() => { - loadFixtures('static/balsamiq_viewer.html'); + loadFixtures('static/balsamiq_viewer.html.raw'); container = document.getElementById('js-balsamiq-viewer'); balsamiqViewer = new BalsamiqViewer(container); diff --git a/spec/javascripts/blob/blob_file_dropzone_spec.js b/spec/javascripts/blob/blob_file_dropzone_spec.js index cab06a0a9be..432d8a65b0a 100644 --- a/spec/javascripts/blob/blob_file_dropzone_spec.js +++ b/spec/javascripts/blob/blob_file_dropzone_spec.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import BlobFileDropzone from '~/blob/blob_file_dropzone'; describe('BlobFileDropzone', function() { - preloadFixtures('blob/show.html'); + preloadFixtures('blob/show.html.raw'); beforeEach(() => { - loadFixtures('blob/show.html'); + loadFixtures('blob/show.html.raw'); const form = $('.js-upload-blob-form'); this.blobFileDropzone = new BlobFileDropzone(form, 'POST'); this.dropzone = $('.js-upload-blob-form .dropzone').get(0).dropzone; diff --git a/spec/javascripts/blob/notebook/index_spec.js b/spec/javascripts/blob/notebook/index_spec.js index 6bb5bac007f..28d3b2f5ea3 100644 --- a/spec/javascripts/blob/notebook/index_spec.js +++ b/spec/javascripts/blob/notebook/index_spec.js @@ -3,10 +3,10 @@ import axios from '~/lib/utils/axios_utils'; import renderNotebook from '~/blob/notebook'; describe('iPython notebook renderer', () => { - preloadFixtures('static/notebook_viewer.html'); + preloadFixtures('static/notebook_viewer.html.raw'); beforeEach(() => { - loadFixtures('static/notebook_viewer.html'); + loadFixtures('static/notebook_viewer.html.raw'); }); it('shows loading icon', () => { diff --git a/spec/javascripts/blob/pdf/index_spec.js b/spec/javascripts/blob/pdf/index_spec.js index acf87580777..be917a0613f 100644 --- a/spec/javascripts/blob/pdf/index_spec.js +++ b/spec/javascripts/blob/pdf/index_spec.js @@ -15,10 +15,10 @@ describe('PDF renderer', () => { } }; - preloadFixtures('static/pdf_viewer.html'); + preloadFixtures('static/pdf_viewer.html.raw'); beforeEach(() => { - loadFixtures('static/pdf_viewer.html'); + loadFixtures('static/pdf_viewer.html.raw'); viewer = document.getElementById('js-pdf-viewer'); viewer.dataset.endpoint = testPDF; }); diff --git a/spec/javascripts/blob/sketch/index_spec.js b/spec/javascripts/blob/sketch/index_spec.js index 3d3129e10da..2b1e81e9cbc 100644 --- a/spec/javascripts/blob/sketch/index_spec.js +++ b/spec/javascripts/blob/sketch/index_spec.js @@ -13,10 +13,10 @@ describe('Sketch viewer', () => { }); }; - preloadFixtures('static/sketch_viewer.html'); + preloadFixtures('static/sketch_viewer.html.raw'); beforeEach(() => { - loadFixtures('static/sketch_viewer.html'); + loadFixtures('static/sketch_viewer.html.raw'); }); describe('with error message', () => { diff --git a/spec/javascripts/blob/viewer/index_spec.js b/spec/javascripts/blob/viewer/index_spec.js index 4ac15ca5aa2..93a942fe8d4 100644 --- a/spec/javascripts/blob/viewer/index_spec.js +++ b/spec/javascripts/blob/viewer/index_spec.js @@ -9,12 +9,12 @@ describe('Blob viewer', () => { let blob; let mock; - preloadFixtures('snippets/show.html'); + preloadFixtures('snippets/show.html.raw'); beforeEach(() => { mock = new MockAdapter(axios); - loadFixtures('snippets/show.html'); + loadFixtures('snippets/show.html.raw'); $('#modal-upload-blob').remove(); blob = new BlobViewer(); |