diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-07-20 21:26:25 +0000 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-07-20 21:26:25 +0000 |
commit | 2ec7b5182de8716876438786dc30d19f114eb878 (patch) | |
tree | 98161554ab0de1da534e325b3b6e6f87540392c1 | |
parent | 3873617548c03359e4fb9e093d181a7d61f642c4 (diff) | |
parent | 85b982a4c57fe0870d2b9a119e1d4e8d56ff2c10 (diff) | |
download | gitlab-ce-2ec7b5182de8716876438786dc30d19f114eb878.tar.gz |
Merge branch '_acet-fix-spec' into 'master'
Fix one disabled spec of comment posting.
See merge request gitlab-org/gitlab-ce!20747
-rw-r--r-- | spec/features/merge_request/user_posts_diff_notes_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_request/user_posts_diff_notes_spec.rb b/spec/features/merge_request/user_posts_diff_notes_spec.rb index 02d19db3828..77261f9375c 100644 --- a/spec/features/merge_request/user_posts_diff_notes_spec.rb +++ b/spec/features/merge_request/user_posts_diff_notes_spec.rb @@ -185,11 +185,11 @@ describe 'Merge request > User posts diff notes', :js do end 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) 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_button('Reply...') end |