Merge branch 'fix-missing-start-discussion-method-qa' into 'master'

[EE] Fix failing E2E test ee_add_batch_comments_in_merge_request_spec.rb

See merge request gitlab-org/gitlab-ee!9084

qa/qa/page/component/note.rb

@@ -32,9 +32,13 @@ module QA
           click_element :comment_button
         end
 
-        def reply_to_discussion(reply_text)
+        def type_reply_to_discussion(reply_text)
           all_elements(:discussion_reply).last.click
           fill_element :reply_input, reply_text
+        end
+
+        def reply_to_discussion(reply_text)
+          type_reply_to_discussion(reply_text)
           click_element :reply_comment_button
         end
 

qa/qa/page/merge_request/show.rb

@@ -5,6 +5,7 @@ module QA
     module MergeRequest
       class Show < Page::Base
         prepend QA::EE::Page::MergeRequest::Show
+        include Page::Component::Note
 
         view 'app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue' do
           element :merge_button

qa/qa/specs/features/browser_ui/3_create/merge_request/ee_add_batch_comments_in_merge_request_spec.rb

@@ -23,12 +23,12 @@ module QA
           show_page.start_discussion("I'm starting a new discussion")
           expect(show_page).to have_content("I'm starting a new discussion")
 
-          show_page.reply_to_discussion("Could you please check this?")
+          show_page.type_reply_to_discussion("Could you please check this?")
           show_page.comment_now
           expect(show_page).to have_content("Could you please check this?")
           expect(show_page).to have_content("0/1 discussion resolved")
 
-          show_page.reply_to_discussion("Could you also check that?")
+          show_page.type_reply_to_discussion("Could you also check that?")
           show_page.resolve_review_discussion
           show_page.start_review
           expect(show_page).to have_content("Could you also check that?")
@@ -40,7 +40,7 @@ module QA
           show_page.comment_now
           expect(show_page).to have_content("Can you check this line of code?")
 
-          show_page.reply_to_discussion("And this syntax as well?")
+          show_page.type_reply_to_discussion("And this syntax as well?")
           show_page.resolve_review_discussion
           show_page.start_review
           expect(show_page).to have_content("And this syntax as well?")
@@ -49,7 +49,7 @@ module QA
           show_page.submit_pending_reviews
           expect(show_page).to have_content("2/2 discussions resolved")
 
-          show_page.reply_to_discussion("Unresolving this discussion")
+          show_page.type_reply_to_discussion("Unresolving this discussion")
           show_page.unresolve_review_discussion
           show_page.comment_now
           expect(show_page).to have_content("1/2 discussions resolved")
@@ -58,7 +58,7 @@ module QA
         Page::MergeRequest::Show.perform do |show_page|
           show_page.go_to_discussions_tab
 
-          show_page.reply_to_discussion("Planning to discard this comment")
+          show_page.type_reply_to_discussion("Planning to discard this comment")
           show_page.start_review
 
           expect(show_page).to have_content("Finish review 1")