Merge branch 'fix-non-diff-resolved-discussion' into 'master'
Force non diff resolved discussion to display when collapse toggled Closes #39187 See merge request gitlab-org/gitlab-ce!14946
This commit is contained in:
commit
9c3f094a2f
|
@ -44,4 +44,4 @@
|
||||||
= render "discussions/diff_with_notes", discussion: discussion
|
= render "discussions/diff_with_notes", discussion: discussion
|
||||||
- else
|
- else
|
||||||
.panel.panel-default
|
.panel.panel-default
|
||||||
= render "discussions/notes", discussion: discussion
|
= render partial: "discussions/notes", locals: { discussion: discussion, disable_collapse_class: true }
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Force non diff resolved discussion to display when collapse toggled
|
||||||
|
merge_request:
|
||||||
|
author:
|
||||||
|
type: fixed
|
|
@ -121,14 +121,31 @@ shared_examples 'discussion comments' do |resource_name|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'clicking "Start discussion" will post a discussion' do
|
describe 'creating a discussion' do
|
||||||
find(submit_selector).click
|
before do
|
||||||
|
find(submit_selector).click
|
||||||
|
find(comments_selector, match: :first)
|
||||||
|
end
|
||||||
|
|
||||||
find(comments_selector, match: :first)
|
it 'clicking "Start discussion" will post a discussion' do
|
||||||
new_comment = all(comments_selector).last
|
new_comment = all(comments_selector).last
|
||||||
|
|
||||||
expect(new_comment).to have_content 'a'
|
expect(new_comment).to have_content 'a'
|
||||||
expect(new_comment).to have_selector '.discussion'
|
expect(new_comment).to have_selector '.discussion'
|
||||||
|
end
|
||||||
|
|
||||||
|
if resource_name == 'merge request'
|
||||||
|
it 'shows resolved discussion when toggled' do
|
||||||
|
click_button "Resolve discussion"
|
||||||
|
|
||||||
|
expect(page).to have_selector('.note-row-1', visible: true)
|
||||||
|
|
||||||
|
refresh
|
||||||
|
click_button "Toggle discussion"
|
||||||
|
|
||||||
|
expect(page).to have_selector('.note-row-1', visible: true)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if resource_name == 'issue'
|
if resource_name == 'issue'
|
||||||
|
|
Loading…
Reference in New Issue