diff options
author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-11-07 19:57:26 -0200 |
---|---|---|
committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-11-07 19:57:26 -0200 |
commit | 198402b38b59a43aa6e50259d7c13c0097dbdfac (patch) | |
tree | 972469d726a9fc38fa990ed6a5b29d9e91b409f6 /spec/features/merge_request/user_posts_diff_notes_spec.rb | |
parent | 8467167bbc7fb16e25b202c6eda37a9fe1f1a9d7 (diff) | |
download | gitlab-ce-198402b38b59a43aa6e50259d7c13c0097dbdfac.tar.gz |
Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"osw-revert-comment-in-any-diff-line
This reverts commit a82a595728d54bdc12e51dfcfb22e9eddc449143, reversing
changes made to e7df959b8f99875edd246c7ac7779c3203e8755e.
Diffstat (limited to 'spec/features/merge_request/user_posts_diff_notes_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_posts_diff_notes_spec.rb | 13 |
1 files changed, 6 insertions, 7 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 51b78d3e7d1..fa148715855 100644 --- a/spec/features/merge_request/user_posts_diff_notes_spec.rb +++ b/spec/features/merge_request/user_posts_diff_notes_spec.rb @@ -85,13 +85,12 @@ describe 'Merge request > User posts diff notes', :js do # `.line_holder` will be an unfolded line. let(:line_holder) { first('#a5cc2925ca8258af241be7e5b0381edf30266302 .line_holder') } - it 'allows commenting on the left side' do - should_allow_commenting(line_holder, 'left') + it 'does not allow commenting on the left side' do + should_not_allow_commenting(line_holder, 'left') end - it 'allows commenting on the right side' do - # Automatically shifts comment box to left side. - should_allow_commenting(line_holder, 'right') + it 'does not allow commenting on the right side' do + should_not_allow_commenting(line_holder, 'right') end end end @@ -148,8 +147,8 @@ describe 'Merge request > User posts diff notes', :js do # `.line_holder` will be an unfolded line. let(:line_holder) { first('.line_holder[id="a5cc2925ca8258af241be7e5b0381edf30266302_1_1"]') } - it 'allows commenting' do - should_allow_commenting line_holder + it 'does not allow commenting' do + should_not_allow_commenting line_holder end end |