From 25b658cf6545f1ab7b1aecc902e6f833af3e3949 Mon Sep 17 00:00:00 2001
From: "at.ramya" <rauthappan@gitlab.com>
Date: Wed, 17 Oct 2018 10:40:26 +0530
Subject: QA Selectors for Batch Comment E2E Automation

---
 .../diffs/components/diff_line_gutter_content.vue  |  2 +-
 .../diffs/components/parallel_diff_table_row.vue   |  2 +-
 .../javascripts/notes/components/comment_form.vue  |  4 ++--
 .../javascripts/notes/components/note_form.vue     |  2 +-
 .../notes/components/noteable_discussion.vue       |  2 +-
 app/views/projects/merge_requests/show.html.haml   |  4 ++--
 qa/qa/page/merge_request/show.rb                   | 26 ++++++++++++++++++++++
 7 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue b/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue
index 6eff3013dcd..f4a9be19496 100644
--- a/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue
+++ b/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue
@@ -167,7 +167,7 @@ export default {
       <button
         v-if="shouldShowCommentButton"
         type="button"
-        class="add-diff-note js-add-diff-note-button"
+        class="add-diff-note js-add-diff-note-button qa-diff-comment"
         title="Add a comment to this line"
         @click="handleCommentButton"
       >
diff --git a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
index fcc3b3e9117..f8af5fc434c 100644
--- a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
+++ b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
@@ -143,7 +143,7 @@ export default {
         :show-comment-button="true"
         :diff-view-type="parallelDiffViewType"
         line-position="right"
-        class="diff-line-num new_line"
+        class="diff-line-num new_line qa-new-diff-line"
       />
       <td
         :id="line.right.lineCode"
diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue
index b980e43b898..554db102027 100644
--- a/app/assets/javascripts/notes/components/comment_form.vue
+++ b/app/assets/javascripts/notes/components/comment_form.vue
@@ -390,7 +390,7 @@ append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
                     :disabled="isSubmitButtonDisabled"
                     name="button"
                     type="button"
-                    class="btn comment-btn note-type-toggle js-note-new-discussion dropdown-toggle"
+                    class="btn comment-btn note-type-toggle js-note-new-discussion dropdown-toggle qa-note-dropdown"
                     data-display="static"
                     data-toggle="dropdown"
                     aria-label="Open comment type dropdown">
@@ -422,7 +422,7 @@ append-right-10 comment-type-dropdown js-comment-type-dropdown droplab-dropdown"
                     <li :class="{ 'droplab-item-selected': noteType === 'discussion' }">
                       <button
                         type="button"
-                        class="btn btn-transparent"
+                        class="btn btn-transparent qa-discussion-option"
                         @click.prevent="setNoteType('discussion')">
                         <i
                           aria-hidden="true"
diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue
index 38c43e5fe08..31ee8fed984 100644
--- a/app/assets/javascripts/notes/components/note_form.vue
+++ b/app/assets/javascripts/notes/components/note_form.vue
@@ -187,7 +187,7 @@ export default {
           :data-supports-quick-actions="!isEditing"
           name="note[note]"
           class="note-textarea js-gfm-input js-note-text
-js-autosize markdown-area js-vue-issue-note-form js-vue-textarea"
+js-autosize markdown-area js-vue-issue-note-form js-vue-textarea qa-reply-input"
           aria-label="Description"
           placeholder="Write a comment or drag your files here…"
           @keydown.meta.enter="handleUpdate()"
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue
index c5fdfa1d47c..6293dd5b7e1 100644
--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/notes/components/noteable_discussion.vue
@@ -369,7 +369,7 @@ Please check your network connection and try again.`;
                         role="group">
                         <button
                           type="button"
-                          class="js-vue-discussion-reply btn btn-text-field mr-2"
+                          class="js-vue-discussion-reply btn btn-text-field mr-2 qa-discussion-reply"
                           title="Add a reply"
                           @click="showReplyForm">Reply...</button>
                       </div>
diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml
index efc2d88172e..56d97ebc316 100644
--- a/app/views/projects/merge_requests/show.html.haml
+++ b/app/views/projects/merge_requests/show.html.haml
@@ -33,7 +33,7 @@
           .fade-left= icon('angle-left')
           .fade-right= icon('angle-right')
           %ul.merge-request-tabs.nav-tabs.nav.nav-links.scrolling-tabs
-            %li.notes-tab
+            %li.notes-tab.qa-notes-tab
               = tab_link_for @merge_request, :show, force_link: @commit.present? do
                 Discussion
                 %span.badge.badge-pill= @merge_request.related_notes.user.count
@@ -47,7 +47,7 @@
                 = tab_link_for @merge_request, :pipelines do
                   Pipelines
                   %span.badge.badge-pill.js-pipelines-mr-count= @pipelines.size
-            %li.diffs-tab
+            %li.diffs-tab.qa-diffs-tab
               = tab_link_for @merge_request, :diffs do
                 Changes
                 %span.badge.badge-pill= @merge_request.diff_size
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index 376606afb5d..ed487d94c33 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -23,6 +23,32 @@ module QA
           element :squash_checkbox
         end
 
+        view 'app/views/projects/merge_requests/show.html.haml' do
+          element :notes_tab
+          element :diffs_tab
+        end
+
+        view 'app/assets/javascripts/diffs/components/diff_line_gutter_content.vue' do
+          element :diff_comment
+        end
+
+        view 'app/assets/javascripts/notes/components/comment_form.vue' do
+          element :note_dropdown
+          element :discussion_option
+        end
+
+        view 'app/assets/javascripts/notes/components/note_form.vue' do
+          element :reply_input
+        end
+
+        view 'app/assets/javascripts/notes/components/noteable_discussion.vue' do
+          element :discussion_reply
+        end
+
+        view 'app/assets/javascripts/diffs/components/parallel_diff_table_row.vue' do
+          element :new_diff_line
+        end
+
         view 'app/views/shared/issuable/_sidebar.html.haml' do
           element :labels_block
         end
-- 
cgit v1.2.1


From dbef128fa306c851cc11ffa722276f45ab8d9205 Mon Sep 17 00:00:00 2001
From: "at.ramya" <rauthappan@gitlab.com>
Date: Tue, 30 Oct 2018 10:13:15 +0530
Subject: Adding methods

---
 qa/qa/page/merge_request/show.rb | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index ed487d94c33..b52072d35ac 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module QA
   module Page
     module MergeRequest
@@ -45,7 +47,7 @@ module QA
           element :discussion_reply
         end
 
-        view 'app/assets/javascripts/diffs/components/parallel_diff_table_row.vue' do
+        view 'app/assets/javascripts/diffs/components/inline_diff_table_row.vue' do
           element :new_diff_line
         end
 
@@ -132,6 +134,35 @@ module QA
 
           click_element :squash_checkbox
         end
+
+        def go_to_discussions_tab
+          click_element :notes_tab
+        end
+
+        def go_to_diffs_tab
+          click_element :diffs_tab
+        end
+
+        def add_comment_to_diff(text)
+          wait(time: 5) do
+            page.has_text?("No newline at end of file")
+          end
+          all_elements(:new_diff_line).first.hover
+          click_element :diff_comment
+          fill_element :reply_input, text
+        end
+
+        def start_discussion(text)
+          fill_element :comment_input, text
+          click_element :note_dropdown
+          click_element :discussion_option
+          click_element :comment_button
+        end
+
+        def reply_to_discussion(reply_text)
+          all_elements(:discussion_reply).first.click
+          fill_element :reply_input, reply_text
+        end
       end
     end
   end
-- 
cgit v1.2.1


From 5722f63f2d8c69a20c874d32dd14dcd6c669e38b Mon Sep 17 00:00:00 2001
From: "at.ramya" <rauthappan@gitlab.com>
Date: Tue, 30 Oct 2018 12:13:43 +0530
Subject: Updating selectors for diff line

---
 app/assets/javascripts/diffs/components/inline_diff_table_row.vue   | 2 +-
 app/assets/javascripts/diffs/components/parallel_diff_table_row.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/diffs/components/inline_diff_table_row.vue b/app/assets/javascripts/diffs/components/inline_diff_table_row.vue
index 62fa34e835a..542acd3d930 100644
--- a/app/assets/javascripts/diffs/components/inline_diff_table_row.vue
+++ b/app/assets/javascripts/diffs/components/inline_diff_table_row.vue
@@ -102,7 +102,7 @@ export default {
       :line-type="newLineType"
       :is-bottom="isBottom"
       :is-hover="isHover"
-      class="diff-line-num new_line"
+      class="diff-line-num new_line qa-new-diff-line"
     />
     <td
       :class="line.type"
diff --git a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
index f8af5fc434c..fcc3b3e9117 100644
--- a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
+++ b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
@@ -143,7 +143,7 @@ export default {
         :show-comment-button="true"
         :diff-view-type="parallelDiffViewType"
         line-position="right"
-        class="diff-line-num new_line qa-new-diff-line"
+        class="diff-line-num new_line"
       />
       <td
         :id="line.right.lineCode"
-- 
cgit v1.2.1


From 956912e5422df99a58c22f2ca8a64dcc96f7467c Mon Sep 17 00:00:00 2001
From: "at.ramya" <rauthappan@gitlab.com>
Date: Wed, 17 Oct 2018 10:40:26 +0530
Subject: QA Selectors for Batch Comment E2E Automation

---
 .../diffs/components/parallel_diff_table_row.vue   |  2 +-
 qa/qa/page/merge_request/show.rb                   | 26 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
index fcc3b3e9117..f8af5fc434c 100644
--- a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
+++ b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
@@ -143,7 +143,7 @@ export default {
         :show-comment-button="true"
         :diff-view-type="parallelDiffViewType"
         line-position="right"
-        class="diff-line-num new_line"
+        class="diff-line-num new_line qa-new-diff-line"
       />
       <td
         :id="line.right.lineCode"
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index b52072d35ac..7f020a878c4 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -55,6 +55,32 @@ module QA
           element :labels_block
         end
 
+        view 'app/views/projects/merge_requests/show.html.haml' do
+          element :notes_tab
+          element :diffs_tab
+        end
+
+        view 'app/assets/javascripts/diffs/components/diff_line_gutter_content.vue' do
+          element :diff_comment
+        end
+
+        view 'app/assets/javascripts/notes/components/comment_form.vue' do
+          element :note_dropdown
+          element :discussion_option
+        end
+
+        view 'app/assets/javascripts/notes/components/note_form.vue' do
+          element :reply_input
+        end
+
+        view 'app/assets/javascripts/notes/components/noteable_discussion.vue' do
+          element :discussion_reply
+        end
+
+        view 'app/assets/javascripts/diffs/components/parallel_diff_table_row.vue' do
+          element :new_diff_line
+        end
+
         def fast_forward_possible?
           !has_text?('Fast-forward merge is not possible')
         end
-- 
cgit v1.2.1


From c4a07e54f39275a755ae72aba493296d17f03dfe Mon Sep 17 00:00:00 2001
From: "at.ramya" <rauthappan@gitlab.com>
Date: Tue, 30 Oct 2018 10:13:15 +0530
Subject: Adding methods

---
 qa/qa/page/merge_request/show.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index 7f020a878c4..7ef710e782d 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -77,7 +77,7 @@ module QA
           element :discussion_reply
         end
 
-        view 'app/assets/javascripts/diffs/components/parallel_diff_table_row.vue' do
+        view 'app/assets/javascripts/diffs/components/inline_diff_table_row.vue' do
           element :new_diff_line
         end
 
-- 
cgit v1.2.1


From 75cfba9df5d8823807ffba5c34c16f50c1cd3cfa Mon Sep 17 00:00:00 2001
From: "at.ramya" <rauthappan@gitlab.com>
Date: Tue, 30 Oct 2018 12:13:43 +0530
Subject: Updating selectors for diff line

---
 app/assets/javascripts/diffs/components/parallel_diff_table_row.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
index f8af5fc434c..fcc3b3e9117 100644
--- a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
+++ b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
@@ -143,7 +143,7 @@ export default {
         :show-comment-button="true"
         :diff-view-type="parallelDiffViewType"
         line-position="right"
-        class="diff-line-num new_line qa-new-diff-line"
+        class="diff-line-num new_line"
       />
       <td
         :id="line.right.lineCode"
-- 
cgit v1.2.1


From 1b4e3e7438ba9d5e5fb169a960e368ee463c1c31 Mon Sep 17 00:00:00 2001
From: "at.ramya" <rauthappan@gitlab.com>
Date: Wed, 31 Oct 2018 10:18:05 +0530
Subject: removing duplicate definitions

---
 qa/qa/page/merge_request/show.rb | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index 7ef710e782d..2e69a89e386 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -55,32 +55,6 @@ module QA
           element :labels_block
         end
 
-        view 'app/views/projects/merge_requests/show.html.haml' do
-          element :notes_tab
-          element :diffs_tab
-        end
-
-        view 'app/assets/javascripts/diffs/components/diff_line_gutter_content.vue' do
-          element :diff_comment
-        end
-
-        view 'app/assets/javascripts/notes/components/comment_form.vue' do
-          element :note_dropdown
-          element :discussion_option
-        end
-
-        view 'app/assets/javascripts/notes/components/note_form.vue' do
-          element :reply_input
-        end
-
-        view 'app/assets/javascripts/notes/components/noteable_discussion.vue' do
-          element :discussion_reply
-        end
-
-        view 'app/assets/javascripts/diffs/components/inline_diff_table_row.vue' do
-          element :new_diff_line
-        end
-
         def fast_forward_possible?
           !has_text?('Fast-forward merge is not possible')
         end
@@ -186,7 +160,7 @@ module QA
         end
 
         def reply_to_discussion(reply_text)
-          all_elements(:discussion_reply).first.click
+          all_elements(:discussion_reply).last.click
           fill_element :reply_input, reply_text
         end
       end
-- 
cgit v1.2.1