diff options
| author | Samantha Ming <sming@gitlab.com> | 2019-09-12 10:41:19 +0300 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-09-12 10:41:19 +0300 |
| commit | 589c8d5625f64edf4dfaf9ddf1f9f4b2fe7efb32 (patch) | |
| tree | 45bf0e41e0b754f378b654b59820f23702e8df56 /spec | |
| parent | 42b8e6838e8d63dcad7641a6164d178e9e09262a (diff) | |
Hide resolve thread button from guest
- Show if user can_resolve all of the notes
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/frontend/notes/components/discussion_actions_spec.js | 9 | ||||
| -rw-r--r-- | spec/javascripts/notes/components/noteable_discussion_spec.js | 4 | ||||
| -rw-r--r-- | spec/javascripts/notes/mock_data.js | 3 |
3 files changed, 16 insertions, 0 deletions
diff --git a/spec/frontend/notes/components/discussion_actions_spec.js b/spec/frontend/notes/components/discussion_actions_spec.js index 0a52c81571e..f582729d773 100644 --- a/spec/frontend/notes/components/discussion_actions_spec.js +++ b/spec/frontend/notes/components/discussion_actions_spec.js @@ -65,6 +65,15 @@ describe('DiscussionActions', () => { expect(wrapper.find(JumpToNextDiscussionButton).exists()).toBe(false); }); + + it('does not renders discussion button for non-member', () => { + const discussion = JSON.parse(JSON.stringify(discussionMock)); + discussion.notes[1].current_user.can_resolve = false; + createComponent({ discussion }); + + expect(wrapper.find(ResolveDiscussionButton).exists()).toBe(false); + expect(wrapper.find(ResolveWithIssueButton).exists()).toBe(false); + }); }); describe('events handling', () => { diff --git a/spec/javascripts/notes/components/noteable_discussion_spec.js b/spec/javascripts/notes/components/noteable_discussion_spec.js index 74805ca8c00..ea5c57b8a7c 100644 --- a/spec/javascripts/notes/components/noteable_discussion_spec.js +++ b/spec/javascripts/notes/components/noteable_discussion_spec.js @@ -255,6 +255,10 @@ describe('noteable_discussion component', () => { discussion.notes = discussion.notes.map(note => ({ ...note, resolved: false, + current_user: { + ...note.current_user, + can_resolve: true, + }, })); wrapper.setProps({ discussion }); diff --git a/spec/javascripts/notes/mock_data.js b/spec/javascripts/notes/mock_data.js index 3812d46f838..f0e58cbda4d 100644 --- a/spec/javascripts/notes/mock_data.js +++ b/spec/javascripts/notes/mock_data.js @@ -200,6 +200,7 @@ export const discussionMock = { current_user: { can_edit: true, can_award_emoji: true, + can_resolve: true, }, discussion_id: '9e3bd2f71a01de45fd166e6719eb380ad9f270b1', emoji_awardable: true, @@ -246,6 +247,7 @@ export const discussionMock = { current_user: { can_edit: true, can_award_emoji: true, + can_resolve: true, }, discussion_id: '9e3bd2f71a01de45fd166e6719eb380ad9f270b1', emoji_awardable: true, @@ -292,6 +294,7 @@ export const discussionMock = { current_user: { can_edit: true, can_award_emoji: true, + can_resolve: true, }, discussion_id: '9e3bd2f71a01de45fd166e6719eb380ad9f270b1', emoji_awardable: true, |