root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '_acet-fix-spec' into 'master' 

Fix one disabled spec of comment posting.

See merge request gitlab-org/gitlab-ce!20747
This commit is contained in:
Tim Zallmann 2018-07-20 21:26:25 +00:00
parent 3873617548 85b982a4c5
commit 2ec7b5182d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spec/features/merge_request/user_posts_diff_notes_spec.rb
View File

@ -185,11 +185,11 @@ describe 'Merge request > User posts diff notes', :js do
end end
describe 'posting a note' do describe 'posting a note' do
xit 'adds as discussion' do it 'adds as discussion' do
expect(page).to have_css('.js-temp-notes-holder', count: 2) expect(page).to have_css('.js-temp-notes-holder', count: 2)
should_allow_commenting(find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9_22_22"]'), asset_form_reset: false) should_allow_commenting(find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9_22_22"]'), asset_form_reset: false)
expect(page).to have_css('.notes_holder .note', count: 1) expect(page).to have_css('.notes_holder .note.note-discussion', count: 1)
expect(page).to have_css('.js-temp-notes-holder', count: 1) expect(page).to have_css('.js-temp-notes-holder', count: 1)
expect(page).to have_button('Reply...') expect(page).to have_button('Reply...')
end end