From 3e9bb4ad314955c6d33db5d2f7dc8bab1df4e85f Mon Sep 17 00:00:00 2001 From: Winnie Hellmann Date: Thu, 21 Mar 2019 07:44:05 +0100 Subject: Remove .raw from JavaScript fixture file names There is nothing more to say but "Commits that change 30 or more lines across at least three files must describe these changes in the commit body" --- spec/javascripts/blob/sketch/index_spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/javascripts/blob/sketch/index_spec.js') diff --git a/spec/javascripts/blob/sketch/index_spec.js b/spec/javascripts/blob/sketch/index_spec.js index 2b1e81e9cbc..3d3129e10da 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.raw'); + preloadFixtures('static/sketch_viewer.html'); beforeEach(() => { - loadFixtures('static/sketch_viewer.html.raw'); + loadFixtures('static/sketch_viewer.html'); }); describe('with error message', () => { -- cgit v1.2.1 From 022968764ced43c5de0c3291cfe2fbc7b068e944 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Fri, 22 Mar 2019 11:03:15 +0000 Subject: Revert "Merge branch 'winh-remove-sushi' into 'master'" This reverts merge request !26430 --- spec/javascripts/blob/sketch/index_spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/javascripts/blob/sketch/index_spec.js') 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', () => { -- cgit v1.2.1 From ad985a7a28c19a085011afc7531f4f2c13783cb2 Mon Sep 17 00:00:00 2001 From: Winnie Hellmann Date: Tue, 26 Mar 2019 16:03:28 +0000 Subject: Merge branch 'winh-remove-sushi' into 'master' Remove .raw from JavaScript fixture file names Closes #59201 See merge request gitlab-org/gitlab-ce!26430 (cherry picked from commit 79a45f7f02939a1c2fc1f378e43ec9b96630f918) --- spec/javascripts/blob/sketch/index_spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/javascripts/blob/sketch/index_spec.js') diff --git a/spec/javascripts/blob/sketch/index_spec.js b/spec/javascripts/blob/sketch/index_spec.js index 2b1e81e9cbc..3d3129e10da 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.raw'); + preloadFixtures('static/sketch_viewer.html'); beforeEach(() => { - loadFixtures('static/sketch_viewer.html.raw'); + loadFixtures('static/sketch_viewer.html'); }); describe('with error message', () => { -- cgit v1.2.1