Commit 73488a9b authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'add-resolve-discussion-test' into 'master'

Add explicit test to test resolved discussion toggle content

See merge request gitlab-org/gitlab-ce!14796
parents 8ae7963c 501d2df4
...@@ -88,14 +88,24 @@ feature 'Diff notes resolve', :js do ...@@ -88,14 +88,24 @@ feature 'Diff notes resolve', :js do
end end
end end
it 'hides resolved discussion' do describe 'resolved discussion' do
page.within '.diff-content' do before do
click_button 'Resolve discussion' page.within '.diff-content' do
click_button 'Resolve discussion'
end
visit_merge_request
end end
visit_merge_request it 'hides when resolve discussion is clicked' do
expect(page).to have_selector('.discussion-body', visible: false)
end
expect(page).to have_selector('.discussion-body', visible: false) it 'shows resolved discussion when toggled' do
find(".timeline-content .discussion[data-discussion-id='#{note.discussion_id}'] .discussion-toggle-button").click
expect(page.find(".timeline-content #note_#{note.noteable_id}")).to be_visible
end
end end
it 'allows user to resolve from reply form without a comment' do it 'allows user to resolve from reply form without a comment' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment