diff options
author | winniehell <git@winniehell.de> | 2016-11-23 01:25:11 +0100 |
---|---|---|
committer | winniehell <git@winniehell.de> | 2016-11-23 01:29:32 +0100 |
commit | 4b4fd743c35aad51e42d074336191035e7303cf0 (patch) | |
tree | f5b402ed7a253511cbaa89ced581dfa48f876ed4 | |
parent | 448c19aab1689ef43658a1f0fa0315e206ae895f (diff) | |
download | gitlab-ce-4b4fd743c35aad51e42d074336191035e7303cf0.tar.gz |
Replace static fixture for zen_mode_spec (!7686)
-rw-r--r-- | changelogs/unreleased/zen-mode-fixture.yml | 4 | ||||
-rw-r--r-- | spec/javascripts/fixtures/zen_mode.html.haml | 8 | ||||
-rw-r--r-- | spec/javascripts/zen_mode_spec.js | 9 |
3 files changed, 9 insertions, 12 deletions
diff --git a/changelogs/unreleased/zen-mode-fixture.yml b/changelogs/unreleased/zen-mode-fixture.yml new file mode 100644 index 00000000000..bec6f6e6dba --- /dev/null +++ b/changelogs/unreleased/zen-mode-fixture.yml @@ -0,0 +1,4 @@ +--- +title: Replace static fixture for zen_mode_spec +merge_request: 7686 +author: winniehell diff --git a/spec/javascripts/fixtures/zen_mode.html.haml b/spec/javascripts/fixtures/zen_mode.html.haml deleted file mode 100644 index cb906a7feaa..00000000000 --- a/spec/javascripts/fixtures/zen_mode.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -.md-area - .zen-backdrop - %textarea#note_note.js-gfm-input.markdown-area - %a.js-zen-enter(tabindex="-1" href="#") - %i.fa.fa-expand - Edit in fullscreen - %a.js-zen-leave(tabindex="-1" href="#") - %i.fa.fa-compress diff --git a/spec/javascripts/zen_mode_spec.js b/spec/javascripts/zen_mode_spec.js index a18e8aee9b1..b9acaaa5a0d 100644 --- a/spec/javascripts/zen_mode_spec.js +++ b/spec/javascripts/zen_mode_spec.js @@ -6,9 +6,10 @@ var enterZen, escapeKeydown, exitZen; describe('ZenMode', function() { - fixture.preload('zen_mode.html'); + var fixtureName = 'issues/open-issue.html.raw'; + fixture.preload(fixtureName); beforeEach(function() { - fixture.load('zen_mode.html'); + fixture.load(fixtureName); spyOn(Dropzone, 'forElement').and.callFake(function() { return { enable: function() { @@ -60,11 +61,11 @@ }); enterZen = function() { - return $('a.js-zen-enter').click(); + return $('.js-zen-enter').click(); }; exitZen = function() { // Ohmmmmmmm - return $('a.js-zen-leave').click(); + return $('.js-zen-leave').click(); }; escapeKeydown = function() { |