Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-03-22 14:03:15 +0300
committerFilipa Lacerda <filipa@gitlab.com>2019-03-22 14:03:15 +0300
commit022968764ced43c5de0c3291cfe2fbc7b068e944 (patch)
treef8e35bc8b582ecabb7d0b8e559c652fe0ede8262 /spec/javascripts/behaviors
parent685a85c6132fbd1f9e5ace08bd4b2808f3a50a8b (diff)
Revert "Merge branch 'winh-remove-sushi' into 'master'"
This reverts merge request !26430
Diffstat (limited to 'spec/javascripts/behaviors')
-rw-r--r--spec/javascripts/behaviors/quick_submit_spec.js4
-rw-r--r--spec/javascripts/behaviors/requires_input_spec.js4
-rw-r--r--spec/javascripts/behaviors/shortcuts/shortcuts_issuable_spec.js2
3 files changed, 5 insertions, 5 deletions
diff --git a/spec/javascripts/behaviors/quick_submit_spec.js b/spec/javascripts/behaviors/quick_submit_spec.js
index 7af8c984841..681463aab66 100644
--- a/spec/javascripts/behaviors/quick_submit_spec.js
+++ b/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();
diff --git a/spec/javascripts/behaviors/requires_input_spec.js b/spec/javascripts/behaviors/requires_input_spec.js
index 617fe49b059..1bde2bb3024 100644
--- a/spec/javascripts/behaviors/requires_input_spec.js
+++ b/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"]');
});
diff --git a/spec/javascripts/behaviors/shortcuts/shortcuts_issuable_spec.js b/spec/javascripts/behaviors/shortcuts/shortcuts_issuable_spec.js
index 5e457a4e823..4843a0386b5 100644
--- a/spec/javascripts/behaviors/shortcuts/shortcuts_issuable_spec.js
+++ b/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 => {