diff options
author | Fatih Acet <acetfatih@gmail.com> | 2018-11-21 15:31:23 +0100 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2018-11-22 15:45:28 +0100 |
commit | e6cf3c7a6f6fc3924c2e76e529f52c6d1de84985 (patch) | |
tree | bedbf5f13e04fda1899a01a267b2f22bc058e939 /spec | |
parent | 8e11f1fa89d4064d9de402c40e2b6cfeb3e91949 (diff) | |
download | gitlab-ce-e6cf3c7a6f6fc3924c2e76e529f52c6d1de84985.tar.gz |
Allow commenting to resolved non-diff discussions_acet-fix-unable-to-reply-resolved-nondiff-discussion
Diffstat (limited to 'spec')
-rw-r--r-- | spec/javascripts/notes/components/noteable_discussion_spec.js | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/spec/javascripts/notes/components/noteable_discussion_spec.js b/spec/javascripts/notes/components/noteable_discussion_spec.js index 81cb3e1f74d..4b4403689d9 100644 --- a/spec/javascripts/notes/components/noteable_discussion_spec.js +++ b/spec/javascripts/notes/components/noteable_discussion_spec.js @@ -6,6 +6,7 @@ import { noteableDataMock, discussionMock, notesDataMock } from '../mock_data'; import mockDiffFile from '../../diffs/mock_data/diff_file'; const discussionWithTwoUnresolvedNotes = 'merge_requests/resolved_diff_discussion.json'; +const diffDiscussionFixture = 'merge_requests/diff_discussion.json'; describe('noteable_discussion component', () => { const Component = Vue.extend(noteableDiscussion); @@ -115,6 +116,49 @@ describe('noteable_discussion component', () => { .catch(done.fail); }); }); + + describe('isRepliesCollapsed', () => { + it('should return false for diff discussions', done => { + const diffDiscussion = getJSONFixture(diffDiscussionFixture)[0]; + vm.$store.dispatch('setInitialNotes', [diffDiscussion]); + + Vue.nextTick() + .then(() => { + expect(vm.isRepliesCollapsed).toEqual(false); + expect(vm.$el.querySelector('.js-toggle-replies')).not.toBeNull(); + expect(vm.$el.querySelector('.discussion-reply-holder')).not.toBeNull(); + }) + .then(done) + .catch(done.fail); + }); + + it('should return false if discussion does not have a reply', () => { + const discussion = { ...discussionMock, resolved: true }; + discussion.notes = discussion.notes.slice(0, 1); + const noRepliesVm = new Component({ + store, + propsData: { discussion }, + }).$mount(); + + expect(noRepliesVm.isRepliesCollapsed).toEqual(false); + expect(noRepliesVm.$el.querySelector('.js-toggle-replies')).toBeNull(); + expect(vm.$el.querySelector('.discussion-reply-holder')).not.toBeNull(); + noRepliesVm.$destroy(); + }); + + it('should return true for resolved non-diff discussion which has replies', () => { + const discussion = { ...discussionMock, resolved: true }; + const resolvedDiscussionVm = new Component({ + store, + propsData: { discussion }, + }).$mount(); + + expect(resolvedDiscussionVm.isRepliesCollapsed).toEqual(true); + expect(resolvedDiscussionVm.$el.querySelector('.js-toggle-replies')).not.toBeNull(); + expect(vm.$el.querySelector('.discussion-reply-holder')).not.toBeNull(); + resolvedDiscussionVm.$destroy(); + }); + }); }); describe('methods', () => { |