diff options
author | Marin Jankovski <marin@gitlab.com> | 2018-02-08 12:47:14 +0000 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2018-02-08 12:47:14 +0000 |
commit | 6ea755fa45406cf31ac8243354c1bb833b60b79b (patch) | |
tree | 58aabe6558881b9ca2e9785a8b9bd735979b4930 /spec/javascripts/notes/components/noteable_note_spec.js | |
parent | 1afbd96d56e93629994fabec4e0383ca8fd1b9d2 (diff) | |
parent | 7e424eb852716495073881710e8a8851b4a4cd5a (diff) | |
download | gitlab-ce-6ea755fa45406cf31ac8243354c1bb833b60b79b.tar.gz |
Merge branch '2018-02-08-ce-cut-off-to-10-5-stable' into '10-5-stable'
Update 10-5-stable to freeze point
See merge request gitlab-org/gitlab-ce!16993
Diffstat (limited to 'spec/javascripts/notes/components/noteable_note_spec.js')
-rw-r--r-- | spec/javascripts/notes/components/noteable_note_spec.js | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/spec/javascripts/notes/components/noteable_note_spec.js b/spec/javascripts/notes/components/noteable_note_spec.js index cb63b64724d..88a7ffb0b9c 100644 --- a/spec/javascripts/notes/components/noteable_note_spec.js +++ b/spec/javascripts/notes/components/noteable_note_spec.js @@ -56,4 +56,25 @@ describe('issue_note', () => { done(); }, 0); }); + + describe('cancel edit', () => { + it('restores content of updated note', (done) => { + const noteBody = 'updated note text'; + vm.updateNote = () => Promise.resolve(); + + vm.formUpdateHandler(noteBody, null, $.noop); + + setTimeout(() => { + expect(vm.note.note_html).toEqual(noteBody); + + vm.formCancelHandler(); + + setTimeout(() => { + expect(vm.note.note_html).toEqual(noteBody); + + done(); + }); + }); + }); + }); }); |