Revert "Merge branch 'winh-remove-sushi' into 'master'"

This reverts merge request !26430

.eslintrc.yml

@@ -9,6 +9,9 @@ plugins:
   - import
   - html
 settings:
+  html/html-extensions:
+    - '.html'
+    - '.html.raw'
   import/resolver:
     webpack:
       config: './config/webpack.config.js'

config/karma.config.js

@@ -110,7 +110,7 @@ module.exports = function(config) {
     frameworks: ['jasmine'],
     files: [
       { pattern: 'spec/javascripts/test_bundle.js', watched: false },
-      { pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.png)', included: false },
+      { pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.html.raw|.png)', included: false },
     ],
     preprocessors: {
       'spec/javascripts/**/*.js': ['webpack', 'sourcemap'],

spec/javascripts/activities_spec.js

@@ -7,7 +7,7 @@ import Pager from '~/pager';
 describe('Activities', () => {
   window.gon || (window.gon = {});
-  const fixtureTemplate = 'static/event_filter.html';
+  const fixtureTemplate = 'static/event_filter.html.raw';
   const filters = [
     {
       id: 'all',

spec/javascripts/ajax_loading_spinner_spec.js

@@ -2,7 +2,7 @@ import $ from 'jquery';
 import AjaxLoadingSpinner from '~/ajax_loading_spinner';
 describe('Ajax Loading Spinner', () => {
-  const fixtureTemplate = 'static/ajax_loading_spinner.html';
+  const fixtureTemplate = 'static/ajax_loading_spinner.html.raw';
   preloadFixtures(fixtureTemplate);
   beforeEach(() => {

spec/javascripts/awards_handler_spec.js

@@ -24,13 +24,13 @@ const lazyAssert = function(done, assertFn) {
 describe('AwardsHandler', function() {
   const emojiData = getJSONFixture('emojis/emojis.json');
-  preloadFixtures('snippets/show.html');
+  preloadFixtures('snippets/show.html.raw');
   beforeEach(function(done) {
     mock = new MockAdapter(axios);
     mock.onGet(`/-/emojis/${EMOJI_VERSION}/emojis.json`).reply(200, emojiData);
-    loadFixtures('snippets/show.html');
+    loadFixtures('snippets/show.html.raw');
     loadAwardsHandler(true)
       .then(obj => {
         awardsHandler = obj;

spec/javascripts/behaviors/quick_submit_spec.js

@@ -4,10 +4,10 @@ import '~/behaviors/quick_submit';
 describe('Quick Submit behavior', function() {
   const keydownEvent = (options = { keyCode: 13, metaKey: true }) => $.Event('keydown', options);
-  preloadFixtures('snippets/show.html');
+  preloadFixtures('snippets/show.html.raw');
   beforeEach(() => {
-    loadFixtures('snippets/show.html');
+    loadFixtures('snippets/show.html.raw');
     $('form').submit(e => {
       // Prevent a form submit from moving us off the testing page
       e.preventDefault();

spec/javascripts/behaviors/requires_input_spec.js

@@ -3,10 +3,10 @@ import '~/behaviors/requires_input';
 describe('requiresInput', () => {
   let submitButton;
-  preloadFixtures('branches/new_branch.html');
+  preloadFixtures('branches/new_branch.html.raw');
   beforeEach(() => {
-    loadFixtures('branches/new_branch.html');
+    loadFixtures('branches/new_branch.html.raw');
     submitButton = $('button[type="submit"]');
   });

spec/javascripts/behaviors/shortcuts/shortcuts_issuable_spec.js

@@ -9,7 +9,7 @@ import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable';
 const FORM_SELECTOR = '.js-main-target-form .js-vue-comment-form';
 describe('ShortcutsIssuable', function() {
-  const fixtureName = 'snippets/show.html';
+  const fixtureName = 'snippets/show.html.raw';
   preloadFixtures(fixtureName);
   beforeAll(done => {

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);

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;

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', () => {

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;
   });

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', () => {

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();

spec/javascripts/boards/components/board_spec.js

@@ -9,7 +9,7 @@ describe('Board component', () => {
   let el;
   beforeEach(done => {
-    loadFixtures('boards/show.html');
+    loadFixtures('boards/show.html.raw');
     el = document.createElement('div');
     document.body.appendChild(el);

spec/javascripts/bootstrap_linked_tabs_spec.js

 import LinkedTabs from '~/lib/utils/bootstrap_linked_tabs';
 describe('Linked Tabs', () => {
-  preloadFixtures('static/linked_tabs.html');
+  preloadFixtures('static/linked_tabs.html.raw');
   beforeEach(() => {
-    loadFixtures('static/linked_tabs.html');
+    loadFixtures('static/linked_tabs.html.raw');
   });
   describe('when is initialized', () => {

spec/javascripts/ci_variable_list/ajax_variable_list_spec.js

@@ -7,8 +7,8 @@ const VARIABLE_PATCH_ENDPOINT = 'http://test.host/frontend-fixtures/builds-proje
 const HIDE_CLASS = 'hide';
 describe('AjaxFormVariableList', () => {
-  preloadFixtures('projects/ci_cd_settings.html');
-  preloadFixtures('projects/ci_cd_settings_with_variables.html');
+  preloadFixtures('projects/ci_cd_settings.html.raw');
+  preloadFixtures('projects/ci_cd_settings_with_variables.html.raw');
   let container;
   let saveButton;
@@ -18,7 +18,7 @@ describe('AjaxFormVariableList', () => {
   let ajaxVariableList;
   beforeEach(() => {
-    loadFixtures('projects/ci_cd_settings.html');
+    loadFixtures('projects/ci_cd_settings.html.raw');
     container = document.querySelector('.js-ci-variable-list-section');
     mock = new MockAdapter(axios);
@@ -168,7 +168,7 @@ describe('AjaxFormVariableList', () => {
   describe('updateRowsWithPersistedVariables', () => {
     beforeEach(() => {
-      loadFixtures('projects/ci_cd_settings_with_variables.html');
+      loadFixtures('projects/ci_cd_settings_with_variables.html.raw');
       container = document.querySelector('.js-ci-variable-list-section');
       const ajaxVariableListEl = document.querySelector('.js-ci-variable-list-section');

spec/javascripts/ci_variable_list/ci_variable_list_spec.js

@@ -5,9 +5,9 @@ import getSetTimeoutPromise from 'spec/helpers/set_timeout_promise_helper';
 const HIDE_CLASS = 'hide';
 describe('VariableList', () => {
-  preloadFixtures('pipeline_schedules/edit.html');
-  preloadFixtures('pipeline_schedules/edit_with_variables.html');
-  preloadFixtures('projects/ci_cd_settings.html');
+  preloadFixtures('pipeline_schedules/edit.html.raw');
+  preloadFixtures('pipeline_schedules/edit_with_variables.html.raw');
+  preloadFixtures('projects/ci_cd_settings.html.raw');
   let $wrapper;
   let variableList;
@@ -15,7 +15,7 @@ describe('VariableList', () => {
   describe('with only key/value inputs', () => {
     describe('with no variables', () => {
       beforeEach(() => {
-        loadFixtures('pipeline_schedules/edit.html');
+        loadFixtures('pipeline_schedules/edit.html.raw');
         $wrapper = $('.js-ci-variable-list-section');
         variableList = new VariableList({
@@ -82,7 +82,7 @@ describe('VariableList', () => {
     describe('with persisted variables', () => {
       beforeEach(() => {
-        loadFixtures('pipeline_schedules/edit_with_variables.html');
+        loadFixtures('pipeline_schedules/edit_with_variables.html.raw');
         $wrapper = $('.js-ci-variable-list-section');
         variableList = new VariableList({
@@ -115,7 +115,7 @@ describe('VariableList', () => {
   describe('with all inputs(key, value, protected)', () => {
     beforeEach(() => {
-      loadFixtures('projects/ci_cd_settings.html');
+      loadFixtures('projects/ci_cd_settings.html.raw');
       $wrapper = $('.js-ci-variable-list-section');
       $wrapper.find('.js-ci-variable-input-protected').attr('data-default', 'false');
@@ -149,7 +149,7 @@ describe('VariableList', () => {
   describe('toggleEnableRow method', () => {
     beforeEach(() => {
-      loadFixtures('pipeline_schedules/edit_with_variables.html');
+      loadFixtures('pipeline_schedules/edit_with_variables.html.raw');
       $wrapper = $('.js-ci-variable-list-section');
       variableList = new VariableList({
@@ -198,7 +198,7 @@ describe('VariableList', () => {
   describe('hideValues', () => {
     beforeEach(() => {
-      loadFixtures('projects/ci_cd_settings.html');
+      loadFixtures('projects/ci_cd_settings.html.raw');
       $wrapper = $('.js-ci-variable-list-section');
       variableList = new VariableList({

spec/javascripts/ci_variable_list/native_form_variable_list_spec.js

@@ -2,12 +2,12 @@ import $ from 'jquery';
 import setupNativeFormVariableList from '~/ci_variable_list/native_form_variable_list';
 describe('NativeFormVariableList', () => {
-  preloadFixtures('pipeline_schedules/edit.html');
+  preloadFixtures('pipeline_schedules/edit.html.raw');
   let $wrapper;
   beforeEach(() => {
-    loadFixtures('pipeline_schedules/edit.html');
+    loadFixtures('pipeline_schedules/edit.html.raw');
     $wrapper = $('.js-ci-variable-list-section');
     setupNativeFormVariableList({

spec/javascripts/clusters/clusters_bundle_spec.js

@@ -9,10 +9,10 @@ import getSetTimeoutPromise from 'spec/helpers/set_timeout_promise_helper';
 describe('Clusters', () => {
   let cluster;
-  preloadFixtures('clusters/show_cluster.html');
+  preloadFixtures('clusters/show_cluster.html.raw');
   beforeEach(() => {
-    loadFixtures('clusters/show_cluster.html');
+    loadFixtures('clusters/show_cluster.html.raw');
     cluster = new Clusters();
   });