diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-12-14 11:49:53 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-12-14 12:05:04 +0000 |
| commit | 670796e15d52776aaee029ab4e108783d5974139 (patch) | |
| tree | 82e6ff5ed69357dbdbc838c80d9e05647d6e31f0 /spec | |
| parent | 0c0b849be1c4499d69bd6afa4be9ee74fa9c7a78 (diff) | |
| download | gitlab-ce-670796e15d52776aaee029ab4e108783d5974139.tar.gz | |
Merge branch 'winh-resolved-discussions-reply-field' into 'master'
Display reply field if resolved discussion has no replies
Closes #54330
See merge request gitlab-org/gitlab-ce!23801
(cherry picked from commit 1d0eadc470a2c7324d002e923eb76ae932862354)
06897b76 Add test for missing reply field on resolved discussions
518b2cdf Display reply field if resolved discussion has no replies
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/support/features/discussion_comments_shared_example.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/spec/support/features/discussion_comments_shared_example.rb b/spec/support/features/discussion_comments_shared_example.rb index 922f3df144d..42a086d58d2 100644 --- a/spec/support/features/discussion_comments_shared_example.rb +++ b/spec/support/features/discussion_comments_shared_example.rb @@ -178,6 +178,16 @@ shared_examples 'discussion comments' do |resource_name| let(:note_id) { find("#{comments_selector} .note:first-child", match: :first)['data-note-id'] } let(:reply_id) { find("#{comments_selector} .note:last-child", match: :first)['data-note-id'] } + it 'can be replied to after resolving' do + click_button "Resolve discussion" + wait_for_requests + + refresh + wait_for_requests + + submit_reply('to reply or not reply') + end + it 'shows resolved discussion when toggled' do submit_reply('a') |