diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-12-01 16:30:34 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-12-01 16:30:34 +0000 |
| commit | 1919ae9615e0eed340b0acf62e575cd2c65c8655 (patch) | |
| tree | e4a4a6c21720092dea45901eb66929d97d4c1bef | |
| parent | 14545f46afb2372da248274ad11232c6e42a3c74 (diff) | |
| parent | 31a4894a098e5ca0230628677045c2de90961520 (diff) | |
| download | gitlab-ce-1919ae9615e0eed340b0acf62e575cd2c65c8655.tar.gz | |
Merge branch 'shortcuts-issuable-fixture' into 'master'
Replace static fixture for shortcuts_issuable_spec
## What does this MR do?
Replace `issuable.html.haml` for `shortcuts_issuable_spec.js` by already existing dynamically generated fixture.
## What are the relevant issue numbers?
#24753
See merge request !7685
| -rw-r--r-- | changelogs/unreleased/shortcuts-issuable-fixture.yml | 4 | ||||
| -rw-r--r-- | spec/javascripts/fixtures/issuable.html.haml | 2 | ||||
| -rw-r--r-- | spec/javascripts/shortcuts_issuable_spec.js | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/changelogs/unreleased/shortcuts-issuable-fixture.yml b/changelogs/unreleased/shortcuts-issuable-fixture.yml new file mode 100644 index 00000000000..88945600886 --- /dev/null +++ b/changelogs/unreleased/shortcuts-issuable-fixture.yml @@ -0,0 +1,4 @@ +--- +title: Replace static fixture for shortcuts_issuable_spec +merge_request: 7685 +author: winniehell diff --git a/spec/javascripts/fixtures/issuable.html.haml b/spec/javascripts/fixtures/issuable.html.haml deleted file mode 100644 index 42ab4aa68b1..00000000000 --- a/spec/javascripts/fixtures/issuable.html.haml +++ /dev/null @@ -1,2 +0,0 @@ -%form.js-main-target-form - %textarea#note_note diff --git a/spec/javascripts/shortcuts_issuable_spec.js b/spec/javascripts/shortcuts_issuable_spec.js index 7d36d79b687..e37816b0a8c 100644 --- a/spec/javascripts/shortcuts_issuable_spec.js +++ b/spec/javascripts/shortcuts_issuable_spec.js @@ -4,9 +4,11 @@ (function() { describe('ShortcutsIssuable', function() { - fixture.preload('issuable.html'); + var fixtureName = 'issues/open-issue.html.raw'; + fixture.preload(fixtureName); beforeEach(function() { - fixture.load('issuable.html'); + fixture.load(fixtureName); + document.querySelector('.js-new-note-form').classList.add('js-main-target-form'); return this.shortcut = new ShortcutsIssuable(); }); return describe('#replyWithSelectedText', function() { |