From ed94b9b4c755c863bb90914c72cf20318fefe58a Mon Sep 17 00:00:00 2001
From: Luke Bennett <lukeeeebennettplus@gmail.com>
Date: Mon, 22 Aug 2016 14:21:18 +0100
Subject: [PATCH] Updated to optimized specs from !5864
---
.../merge_requests/diff_notes_spec.rb | 138 ------------------
1 file changed, 138 deletions(-)
diff --git a/spec/features/merge_requests/diff_notes_spec.rb b/spec/features/merge_requests/diff_notes_spec.rb
index f5bc0543661..482c280c188 100644
--- a/spec/features/merge_requests/diff_notes_spec.rb
+++ b/spec/features/merge_requests/diff_notes_spec.rb
@@ -17,7 +17,6 @@ feature 'Diff notes', js: true, feature: true do
context 'when hovering over the parallel view diff file' do
before(:each) do
-<<<<<<< 7d654c0e1810f2023a1deaeddd542c5c92d20f42
visit diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request, view: 'parallel')
end
@@ -28,111 +27,51 @@ feature 'Diff notes', js: true, feature: true do
it 'should not allow commenting on the right side' do
should_not_allow_commenting(find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9_23_22"]').find(:xpath, '..'), 'right')
-=======
- visit diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
- click_link 'Side-by-side'
- end
-
- context 'with an old line on the left and no line on the right' do
- let(:line_holder) { find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9_23_22"]').find(:xpath, '..') }
-
- it 'should allow commenting on the left side' do
- should_allow_commenting line_holder, 'left'
- end
-
- it 'should not allow commenting on the right side' do
- should_not_allow_commenting line_holder, 'right'
->>>>>>> Added 'with an unfolded line should not allow commenting' scenario (line 125)
end
end
context 'with no line on the left and a new line on the right' do
-<<<<<<< 7d654c0e1810f2023a1deaeddd542c5c92d20f42
it 'should not allow commenting on the left side' do
should_not_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_15"]').find(:xpath, '..'), 'left')
end
it 'should allow commenting on the right side' do
should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_15"]').find(:xpath, '..'), 'right')
-=======
- let(:line_holder) { find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_15_15"]').find(:xpath, '..') }
-
- it 'should not allow commenting on the left side' do
- should_not_allow_commenting line_holder, 'left'
- end
-
- it 'should allow commenting on the right side' do
- should_allow_commenting line_holder, 'right'
->>>>>>> Added 'with an unfolded line should not allow commenting' scenario (line 125)
end
end
context 'with an old line on the left and a new line on the right' do
-<<<<<<< 7d654c0e1810f2023a1deaeddd542c5c92d20f42
it 'should allow commenting on the left side' do
should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_9_9"]').find(:xpath, '..'), 'left')
end
it 'should allow commenting on the right side' do
should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_9_9"]').find(:xpath, '..'), 'right')
-=======
- let(:line_holder) { find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_9_9"]').find(:xpath, '..') }
-
- it 'should allow commenting on the left side' do
- should_allow_commenting line_holder, 'left'
- end
-
- it 'should allow commenting on the right side' do
- should_allow_commenting line_holder, 'right'
->>>>>>> Added 'with an unfolded line should not allow commenting' scenario (line 125)
end
end
context 'with an unchanged line on the left and an unchanged line on the right' do
-<<<<<<< 7d654c0e1810f2023a1deaeddd542c5c92d20f42
it 'should allow commenting on the left side' do
should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_7_7"]', match: :first).find(:xpath, '..'), 'left')
end
it 'should allow commenting on the right side' do
should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_7_7"]', match: :first).find(:xpath, '..'), 'right')
-=======
- let(:line_holder) { first('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_7_7"]').find(:xpath, '..') }
-
- it 'should allow commenting on the left side' do
- should_allow_commenting line_holder, 'left'
- end
-
- it 'should allow commenting on the right side' do
- should_allow_commenting line_holder, 'right'
->>>>>>> Added 'with an unfolded line should not allow commenting' scenario (line 125)
end
end
context 'with a match line' do
-<<<<<<< 7d654c0e1810f2023a1deaeddd542c5c92d20f42
it 'should not allow commenting on the left side' do
should_not_allow_commenting(find('.match', match: :first).find(:xpath, '..'), 'left')
end
it 'should not allow commenting on the right side' do
should_not_allow_commenting(find('.match', match: :first).find(:xpath, '..'), 'right')
-=======
- let(:line_holder) { first('.match').find(:xpath, '..') }
-
- it 'should not allow commenting on the left side' do
- should_not_allow_commenting line_holder, 'left'
- end
-
- it 'should not allow commenting on the right side' do
- should_not_allow_commenting line_holder, 'right'
->>>>>>> Added 'with an unfolded line should not allow commenting' scenario (line 125)
end
end
end
context 'when hovering over the inline view diff file' do
-<<<<<<< 7d654c0e1810f2023a1deaeddd542c5c92d20f42
before do
visit diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request, view: 'inline')
end
@@ -140,58 +79,24 @@ feature 'Diff notes', js: true, feature: true do
context 'with a new line' do
it 'should allow commenting' do
should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9"]'))
-=======
- let(:comment_button_class) { '.add-diff-note' }
-
- before(:each) do
- visit diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
- click_link 'Inline'
- end
-
- context 'with a new line' do
- let(:line_holder) { find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_10_9"]') }
-
- it 'should allow commenting' do
- should_allow_commenting line_holder
->>>>>>> Added 'with an unfolded line should not allow commenting' scenario (line 125)
end
end
context 'with an old line' do
-<<<<<<< 7d654c0e1810f2023a1deaeddd542c5c92d20f42
it 'should allow commenting' do
should_allow_commenting(find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9_22_22"]'))
-=======
- let(:line_holder) { find('[id="6eb14e00385d2fb284765eb1cd8d420d33d63fc9_22_22"]') }
-
- it 'should allow commenting' do
- should_allow_commenting line_holder
->>>>>>> Added 'with an unfolded line should not allow commenting' scenario (line 125)
end
end
context 'with an unchanged line' do
-<<<<<<< 7d654c0e1810f2023a1deaeddd542c5c92d20f42
it 'should allow commenting' do
should_allow_commenting(find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_7_7"]'))
-=======
- let(:line_holder) { find('[id="2f6fcd96b88b36ce98c38da085c795a27d92a3dd_7_7"]') }
-
- it 'should allow commenting' do
- should_allow_commenting line_holder
->>>>>>> Added 'with an unfolded line should not allow commenting' scenario (line 125)
end
end
context 'with a match line' do
-<<<<<<< 7d654c0e1810f2023a1deaeddd542c5c92d20f42
it 'should not allow commenting' do
should_not_allow_commenting(find('.match', match: :first))
-=======
- let(:line_holder) { first('.match') }
-
- it 'should not allow commenting' do
- should_not_allow_commenting line_holder
end
end
@@ -207,13 +112,11 @@ feature 'Diff notes', js: true, feature: true do
it 'should not allow commenting' do
should_not_allow_commenting line_holder
->>>>>>> Added 'with an unfolded line should not allow commenting' scenario (line 125)
end
end
end
def should_allow_commenting(line_holder, diff_side = nil)
-<<<<<<< 7d654c0e1810f2023a1deaeddd542c5c92d20f42
line = get_line_components(line_holder, diff_side)
line[:content].hover
expect(line[:num]).to have_css comment_button_class
@@ -225,61 +128,33 @@ feature 'Diff notes', js: true, feature: true do
def should_not_allow_commenting(line_holder, diff_side = nil)
line = get_line_components(line_holder, diff_side)
-=======
- line = get_line_components line_holder, diff_side
- line[:content].hover
- expect(line[:num]).to have_css comment_button_class
-
- comment_on_line line_holder, line
- wait_for_ajax
-
- assert_comment_persistence line_holder
- end
-
- def should_not_allow_commenting(line_holder, diff_side = nil)
- line = get_line_components line_holder, diff_side
->>>>>>> Added 'with an unfolded line should not allow commenting' scenario (line 125)
line[:content].hover
expect(line[:num]).not_to have_css comment_button_class
end
def get_line_components(line_holder, diff_side = nil)
if diff_side.nil?
-<<<<<<< 7d654c0e1810f2023a1deaeddd542c5c92d20f42
get_inline_line_components(line_holder)
else
get_parallel_line_components(line_holder, diff_side)
-=======
- get_inline_line_components line_holder
- else
- get_parallel_line_components line_holder, diff_side
->>>>>>> Added 'with an unfolded line should not allow commenting' scenario (line 125)
end
end
def get_inline_line_components(line_holder)
-<<<<<<< 7d654c0e1810f2023a1deaeddd542c5c92d20f42
{ content: line_holder.find('.line_content', match: :first), num: line_holder.find('.diff-line-num', match: :first) }
-=======
- { content: line_holder.first('.line_content'), num: line_holder.first('.diff-line-num') }
->>>>>>> Added 'with an unfolded line should not allow commenting' scenario (line 125)
end
def get_parallel_line_components(line_holder, diff_side = nil)
side_index = diff_side == 'left' ? 0 : 1
-<<<<<<< 7d654c0e1810f2023a1deaeddd542c5c92d20f42
# Wait for `.line_content`
line_holder.find('.line_content', match: :first)
# Wait for `.diff-line-num`
line_holder.find('.diff-line-num', match: :first)
-=======
->>>>>>> Added 'with an unfolded line should not allow commenting' scenario (line 125)
{ content: line_holder.all('.line_content')[side_index], num: line_holder.all('.diff-line-num')[side_index] }
end
def comment_on_line(line_holder, line)
line[:num].find(comment_button_class).trigger 'click'
-<<<<<<< 7d654c0e1810f2023a1deaeddd542c5c92d20f42
line_holder.find(:xpath, notes_holder_input_xpath)
notes_holder_input = line_holder.find(:xpath, notes_holder_input_xpath)
@@ -288,26 +163,13 @@ feature 'Diff notes', js: true, feature: true do
notes_holder_input.fill_in 'note[note]', with: test_note_comment
click_button 'Comment'
wait_for_ajax
-=======
- expect(line_holder).to have_xpath notes_holder_input_xpath
-
- notes_holder_input = line_holder.find(:xpath, notes_holder_input_xpath)
- expect(notes_holder_input[:class].include? notes_holder_input_class).to be true
-
- notes_holder_input.fill_in 'note[note]', with: test_note_comment
- click_button 'Comment'
->>>>>>> Added 'with an unfolded line should not allow commenting' scenario (line 125)
end
def assert_comment_persistence(line_holder)
expect(line_holder).to have_xpath notes_holder_input_xpath
notes_holder_saved = line_holder.find(:xpath, notes_holder_input_xpath)
-<<<<<<< 7d654c0e1810f2023a1deaeddd542c5c92d20f42
expect(notes_holder_saved[:class]).not_to include(notes_holder_input_class)
-=======
- expect(notes_holder_saved[:class].include? notes_holder_input_class).to be false
->>>>>>> Added 'with an unfolded line should not allow commenting' scenario (line 125)
expect(notes_holder_saved).to have_content test_note_comment
end
end
--
GitLab