diff options
author | Phil Hughes <me@iamphill.com> | 2018-09-10 19:41:57 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-09-17 09:50:36 +0100 |
commit | 8064ab84a68d439ae5a33f02fd42690f23d1b536 (patch) | |
tree | 63335a6099c99bf9b8dfd90b87c496a7a6617cec /spec | |
parent | 5a8908bf587a0723b07e510dd6118a686d49af98 (diff) | |
download | gitlab-ce-8064ab84a68d439ae5a33f02fd42690f23d1b536.tar.gz |
Re-enable legacy diff notes on merge request diffs
This re-enables legacy diff notes on the merge request diffs
This feature was not workig correctly after the Vue refactor
LegacyDiffNotes have no `position`, instead they only have a `line_code`
As an extra, this also re-enables commenting on legacy diffs.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48873
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/merge_request/user_posts_diff_notes_spec.rb | 15 |
1 files changed, 6 insertions, 9 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 b6ed3686de2..fa148715855 100644 --- a/spec/features/merge_request/user_posts_diff_notes_spec.rb +++ b/spec/features/merge_request/user_posts_diff_notes_spec.rb @@ -200,23 +200,20 @@ describe 'Merge request > User posts diff notes', :js do end context 'with a new line' do - # TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034 - xit 'allows commenting' do - should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9"]').find(:xpath, '..')) + it 'allows commenting' do + should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9"]')) end end context 'with an old line' do - # TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034 - xit 'allows commenting' do - should_allow_commenting(find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9_22_22"]').find(:xpath, '..')) + it 'allows commenting' do + should_allow_commenting(find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9_22_22"]')) end end context 'with an unchanged line' do - # TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034 - xit 'allows commenting' do - should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_7_7"]').find(:xpath, '..')) + it 'allows commenting' do + should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_7_7"]')) end end |