summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIllya Klymov <xanf@xanf.me>2019-09-10 12:26:43 +0300
committerIllya Klymov <xanf@xanf.me>2019-09-10 12:26:43 +0300
commit5eda01593eb3eece10a43aea3f941d4e019e8c9a (patch)
treed4e99bd247be3c892a01a0f1761417e5c1720a6f
parent4d542db508e454d4ed3a2cdb0a91aee67e1c5cd8 (diff)
downloadgitlab-ce-fix-zen-mode-spec.tar.gz
Fix zen mode specfix-zen-mode-spec
-rw-r--r--spec/javascripts/zen_mode_spec.js2
-rw-r--r--spec/support/helpers/javascript_fixtures_helpers.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/spec/javascripts/zen_mode_spec.js b/spec/javascripts/zen_mode_spec.js
index 8f662c71c7a..5dee11b3810 100644
--- a/spec/javascripts/zen_mode_spec.js
+++ b/spec/javascripts/zen_mode_spec.js
@@ -2,6 +2,7 @@ import $ from 'jquery';
import Dropzone from 'dropzone';
import Mousetrap from 'mousetrap';
import ZenMode from '~/zen_mode';
+import initNotes from '~/init_notes';
describe('ZenMode', () => {
let zen;
@@ -28,6 +29,7 @@ describe('ZenMode', () => {
beforeEach(() => {
loadFixtures(fixtureName);
+ initNotes();
dropzoneForElementSpy = spyOn(Dropzone, 'forElement').and.callFake(() => ({
enable: () => true,
diff --git a/spec/support/helpers/javascript_fixtures_helpers.rb b/spec/support/helpers/javascript_fixtures_helpers.rb
index 7ec65318ec5..fd5ad9451f7 100644
--- a/spec/support/helpers/javascript_fixtures_helpers.rb
+++ b/spec/support/helpers/javascript_fixtures_helpers.rb
@@ -69,7 +69,7 @@ module JavaScriptFixturesHelpers
link_tags = doc.css('link')
link_tags.remove
- scripts = doc.css("script:not([type='text/template']):not([type='text/x-template'])")
+ scripts = doc.css("script:not([type='text/template']):not([type='text/x-template']):not([type='application/json'])")
scripts.remove
fixture = doc.to_html