Finished up intial version that uses XPath extensively

1 files changed, 109 insertions, 126 deletions

diff --git a/spec/features/merge_requests/diffs_spec.rb b/spec/features/merge_requests/diffs_spec.rb
index 9ac08b06da8..ae237ad5e3f 100644
--- a/spec/features/merge_requests/diffs_spec.rb
+++ b/spec/features/merge_requests/diffs_spec.rb
@@ -23,172 +23,155 @@ feature 'Diffs URL', js: true, feature: true do
     end
   end
 
-  context 'when hovering over the parallel view diff file' do
+  context 'diff notes' do
     let(:comment_button_class) { '.add-diff-note' }
-
-    before(:each) do
-      visit diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
-      click_link 'Side-by-side'
-      # @old_line_number = first '.diff-line-num.old_line:not(.empty-cell)'
-      # @new_line_number = first '.diff-line-num.new_line:not(.empty-cell)'
-      # @old_line = first '.line_content[data-line-type="old"]'
-      # @new_line = first '.line_content[data-line-type="new"]'
-    end
-
-    context 'with an old line on the left and no line on the right' do
-      it 'should allow commenting on the left side' do
-        puts first('//*[contains(concat(" ", @class, " "), " line_holder ") and child::*[contains(concat(" ", @class, " "), " line_content ") and contains(concat(" ", @class, " "), " old ")] and child::*[contains(concat(" ", @class, " ")," line_content ") and contains(concat(" ", @class, " ")," new ")]]')
-        expect(page).to have_content 'NOPE'
+    let(:notes_holder_input_class) { 'js-temp-notes-holder' }
+    let(:notes_holder_input_xpath) { './following-sibling::*[contains(concat(" ", @class, " "), " notes_holder ")]' }
+    let(:test_note_comment) { 'this is a test note!' }
+    # line_holder = //*[contains(concat(" ", @class, " "), " line_holder "]
+    # old_line = child::*[contains(concat(" ", @class, " "), " line_content ") and contains(concat(" ", @class, " "), " old ")]
+    # new_line = child::*[contains(concat(" ", @class, " ")," line_content ") and contains(concat(" ", @class, " ")," new ")]
+    # match_line = child::*[contains(concat(" ", @class, " ")," line_content ") and contains(concat(" ", @class, " ")," match ")]
+    # unchanged_line = child::*[contains(concat(" ", @class, " ")," line_content ") and not(contains(concat(" ", @class, " ")," old ")) and not(contains(concat(" ", @class, " ")," new ")) and not(contains(concat(" ", @class, " ")," match ")) and boolean(node()[1])]
+    # no_line = child::*[contains(concat(" ", @class, " ")," line_content ") and not(contains(concat(" ", @class, " ")," old ")) and not(contains(concat(" ", @class, " ")," new ")) and not(contains(concat(" ", @class, " ")," match ")) and not(boolean(node()[1]))]
+
+    context 'when hovering over the parallel view diff file' do
+      before(:each) do
+        visit diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
+        click_link 'Side-by-side'
       end
 
-      it 'should not allow commenting on the right side' do
-
-      end
-    end
+      context 'with an old line on the left and no line on the right' do
+        let(:line_holder) { first :xpath, '//*[contains(concat(" ", @class, " "), " line_holder ") and child::*[contains(concat(" ", @class, " "), " line_content ") and contains(concat(" ", @class, " "), " old ")] and child::*[contains(concat(" ", @class, " ")," line_content ") and not(contains(concat(" ", @class, " ")," old ")) and not(contains(concat(" ", @class, " ")," new ")) and not(contains(concat(" ", @class, " ")," match ")) and not(boolean(node()[1]))]]' }
 
-    context 'with no line on the left and a new line on the right' do
-      it 'should allow commenting on the right side' do
+        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'
+        end
       end
 
-      it 'should not allow commenting on the left side' do
+      context 'with no line on the left and a new line on the right' do
+        let(:line_holder) { first :xpath, '//*[contains(concat(" ", @class, " "), " line_holder ") and child::*[contains(concat(" ", @class, " ")," line_content ") and not(contains(concat(" ", @class, " ")," old ")) and not(contains(concat(" ", @class, " ")," new ")) and not(contains(concat(" ", @class, " ")," match ")) and not(boolean(node()[1]))] and child::*[contains(concat(" ", @class, " ")," line_content ") and contains(concat(" ", @class, " ")," new ")]]' }
 
-      end
-    end
-
-    context 'with an old line on the left and a new line on the right' do
-      it 'should allow commenting on the left side' do
+        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'
+        end
       end
 
-      it 'should allow commenting on the right side' do
+      context 'with an old line on the left and a new line on the right' do
+        let(:line_holder) { first :xpath, '//*[contains(concat(" ", @class, " "), " line_holder ") and child::*[contains(concat(" ", @class, " "), " line_content ") and contains(concat(" ", @class, " "), " old ")] and child::*[contains(concat(" ", @class, " ")," line_content ") and contains(concat(" ", @class, " ")," new ")]]' }
+
+        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'
+        end
       end
-    end
 
-    context 'with an unchanged line on the left and an unchanged line on the right' do
-      it 'should allow commenting on the left side' do
+      context 'with an unchanged line on the left and an unchanged line on the right' do
+        let(:line_holder) { first :xpath, '//*[contains(concat(" ", @class, " "), " line_holder ") and child::*[contains(concat(" ", @class, " ")," line_content ") and not(contains(concat(" ", @class, " ")," old ")) and not(contains(concat(" ", @class, " ")," new ")) and not(contains(concat(" ", @class, " ")," match ")) and boolean(node()[1])] and child::*[contains(concat(" ", @class, " ")," line_content ") and not(contains(concat(" ", @class, " ")," old ")) and not(contains(concat(" ", @class, " ")," new ")) and not(contains(concat(" ", @class, " ")," match ")) and boolean(node()[1])]]' }
+
+        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'
+        end
       end
 
-      it 'should allow commenting on the right side' do
+      context 'with a match line' do
+        let(:line_holder) { first :xpath, '//*[contains(concat(" ", @class, " "), " line_holder ") and child::*[contains(concat(" ", @class, " "), " line_content ") and contains(concat(" ", @class, " "), " match ")] and child::*[contains(concat(" ", @class, " ")," line_content ") and contains(concat(" ", @class, " ")," match ")]]' }
+
+        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'
+        end
       end
     end
 
-    context 'with a match line' do
-      it 'should not allow commenting on the left side' do
+    context 'when hovering over the inline view diff file' do
+      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
 
-      it 'should not allow commenting on the right side' do
+      context 'with a new line' do
+        let(:line_holder) { first :xpath, '//*[contains(concat(" ", @class, " "), " line_holder ") and child::*[contains(concat(" ", @class, " "), " line_content ") and contains(concat(" ", @class, " "), " new ")]]' }
 
+        it 'should allow commenting' do
+          should_allow_commenting line_holder
+        end
       end
-    end
-
-    # it 'shows a comment button on the old side when hovering over an old line number' do
-    #   @old_line_number.hover
-    #   expect(@old_line_number).to have_css comment_button_class
-    #   expect(@new_line_number).not_to have_css comment_button_class
-    # end
-    #
-    # it 'shows a comment button on the old side when hovering over an old line' do
-    #   @old_line.hover
-    #   expect(@old_line_number).to have_css comment_button_class
-    #   expect(@new_line_number).not_to have_css comment_button_class
-    # end
-    #
-    # it 'shows a comment button on the new side when hovering over a new line number' do
-    #   @new_line_number.hover
-    #   expect(@new_line_number).to have_css comment_button_class
-    #   expect(@old_line_number).not_to have_css comment_button_class
-    # end
-    #
-    # it 'shows a comment button on the new side when hovering over a new line' do
-    #   @new_line.hover
-    #   expect(@new_line_number).to have_css comment_button_class
-    #   expect(@old_line_number).not_to have_css comment_button_class
-    # end
-  end
 
-  context 'when hovering over the inline view diff file' do
-    let(:comment_button_class) { '.add-diff-note' }
+      context 'with an old line' do
+        let(:line_holder) { first :xpath, '//*[contains(concat(" ", @class, " "), " line_holder ") and child::*[contains(concat(" ", @class, " "), " line_content ") and contains(concat(" ", @class, " "), " old ")]]' }
 
-    before(:each) do
-      visit diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
-      click_link 'Inline'
-      # @old_line_number = first '.diff-line-num.old_line:not(.unfold)'
-      # @new_line_number = first '.diff-line-num.new_line:not(.unfold)'
-      # @new_line = first '.line_content:not(.match)'
-    end
+        it 'should allow commenting' do
+          should_allow_commenting line_holder
+        end
+      end
 
-    context 'with a new line' do
-      it 'should allow commenting' do
+      context 'with an unchanged line' do
+        let(:line_holder) { first :xpath, '//*[contains(concat(" ", @class, " "), " line_holder ") and child::*[contains(concat(" ", @class, " ")," line_content ") and not(contains(concat(" ", @class, " ")," old ")) and not(contains(concat(" ", @class, " ")," new ")) and not(contains(concat(" ", @class, " ")," match ")) and boolean(node()[1])] and child::*[contains(concat(" ", @class, " ")," line_content ") and not(contains(concat(" ", @class, " ")," old ")) and not(contains(concat(" ", @class, " ")," new ")) and not(contains(concat(" ", @class, " ")," match ")) and boolean(node()[1])]]' }
 
+        it 'should allow commenting' do
+          should_allow_commenting line_holder
+        end
       end
-    end
 
-    context 'with an old line' do
-      it 'should allow commenting' do
+      context 'with a match line' do
+        let(:line_holder) { first :xpath, '//*[contains(concat(" ", @class, " "), " line_holder ") and child::*[contains(concat(" ", @class, " "), " line_content ") and contains(concat(" ", @class, " "), " match ")]]' }
 
+        it 'should not allow commenting' do
+          should_not_allow_commenting line_holder
+        end
       end
     end
 
-    context 'with an unchanged line' do
-      it 'should allow commenting' do
-
-      end
+    def should_allow_commenting(line_holder, diff_side = nil)
+      line = get_line diff_side
+      line[:content].hover
+      expect(line[:num]).to have_css comment_button_class
+      line[:num].find(comment_button_class).trigger 'click'
+      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'
+      expect(line_holder).to have_xpath notes_holder_input_xpath
+      notes_holder_saved = line_holder.find(:xpath, notes_holder_input_xpath)
+      expect(notes_holder_saved[:class].include? notes_holder_input_class).to be false
+      expect(notes_holder_saved).to have_content test_note_comment
     end
 
-    context 'with a match line' do
-      it 'should not allow commenting' do
+    def should_not_allow_commenting(line_holder, diff_side = nil)
+      line = get_line diff_side
+      line[:content].hover
+      expect(line[:num]).not_to have_css comment_button_class
+    end
 
+    def get_line(diff_side = nil)
+      if diff_side.nil?
+        { content: line_holder.first('.line_content'), num: line_holder.first('.diff-line-num') }
+      else
+        side_index = diff_side == 'left' ? 0 : 1
+        { content: line_holder.all('.line_content')[side_index], num: line_holder.all('.diff-line-num')[side_index] }
       end
     end
-
-    # it 'shows a comment button on the old side when hovering over an old line number' do
-    #   @old_line_number.hover
-    #   expect(@old_line_number).to have_css comment_button_class
-    #   expect(@new_line_number).not_to have_css comment_button_class
-    # end
-    #
-    # it 'shows a comment button on the new side when hovering over a new line number' do
-    #   @new_line_number.hover
-    #   expect(@old_line_number).to have_css comment_button_class
-    #   expect(@new_line_number).not_to have_css comment_button_class
-    # end
-    #
-    # it 'shows a comment button on the new side when hovering over a new line' do
-    #   @new_line.hover
-    #   expect(@old_line_number).to have_css comment_button_class
-    #   expect(@new_line_number).not_to have_css comment_button_class
-    # end
   end
-
-  # context 'when clicking a comment button' do
-  #   let(:test_note_comment) { 'this is a test note!' }
-  #   let(:note_class) { '.new-note' }
-  #
-  #   before(:each) do
-  #     visit diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
-  #     click_link 'Inline'
-  #     first('.diff-line-num.old_line:not(.unfold)').hover
-  #     find('.add-diff-note').click
-  #   end
-  #
-  #   it 'shows a note form' do
-  #     expect(page).to have_css note_class
-  #   end
-  #
-  #   it 'can be submitted and viewed' do
-  #     fill_in 'note[note]', with: test_note_comment
-  #     click_button 'Comment'
-  #     expect(page).to have_content test_note_comment
-  #   end
-  #
-  #   it 'can be closed' do
-  #     find('.note-form-actions .btn-cancel').click
-  #     expect(page).not_to have_css note_class
-  #   end
-  # end
 end