kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Filipa Lacerda 2017-10-10 20:41:52 +00:00
parent 8ae7963cd0 501d2df40f
commit 73488a9b06
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spec/features/merge_requests/diff_notes_resolve_spec.rb
View File

@ -88,14 +88,24 @@ feature 'Diff notes resolve', :js do
end
end
it 'hides resolved discussion' do
page.within '.diff-content' do
click_button 'Resolve discussion'
describe 'resolved discussion' do
before do
page.within '.diff-content' do
click_button 'Resolve discussion'
end
visit_merge_request
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
it 'allows user to resolve from reply form without a comment' do