1 files changed, 47 insertions, 33 deletions

diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index 0b80ba84fa4..164f25389c0 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -44,15 +44,23 @@ module QA
           element :squash_checkbox
         end
 
-        view 'app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue' do
-          element :skeleton_note
-        end
-
         view 'app/views/projects/merge_requests/show.html.haml' do
           element :notes_tab
           element :diffs_tab
         end
 
+        view 'app/assets/javascripts/diffs/components/compare_dropdown_layout.vue' do
+          element :dropdown_content
+        end
+
+        view 'app/assets/javascripts/diffs/components/compare_versions.vue' do
+          element :target_version_dropdown
+        end
+
+        view 'app/assets/javascripts/diffs/components/diff_file_header.vue' do
+          element :file_name_content
+        end
+
         view 'app/assets/javascripts/diffs/components/inline_diff_table_row.vue' do
           element :new_diff_line
         end
@@ -67,15 +75,13 @@ module QA
 
         view 'app/assets/javascripts/batch_comments/components/review_bar.vue' do
           element :review_bar
-          element :discard_review
-          element :modal_delete_pending_comments
         end
 
         view 'app/assets/javascripts/notes/components/note_form.vue' do
           element :unresolve_review_discussion_checkbox
           element :resolve_review_discussion_checkbox
-          element :start_review
-          element :comment_now
+          element :start_review_button
+          element :comment_now_button
         end
 
         view 'app/assets/javascripts/batch_comments/components/preview_dropdown.vue' do
@@ -83,46 +89,54 @@ module QA
         end
 
         def start_review
-          click_element :start_review
+          click_element(:start_review_button)
 
           # After clicking the button, wait for it to disappear
           # before moving on to the next part of the test
-          has_no_element? :start_review
+          has_no_element?(:start_review_button)
+        end
+
+        def click_target_version_dropdown
+          click_element(:target_version_dropdown)
         end
 
         def comment_now
-          click_element :comment_now
+          click_element(:comment_now_button)
 
           # After clicking the button, wait for it to disappear
           # before moving on to the next part of the test
-          has_no_element? :comment_now
+          has_no_element?(:comment_now_button)
+        end
+
+        def version_dropdown_content
+          find_element(:dropdown_content).text
         end
 
         def submit_pending_reviews
-          within_element :review_bar do
-            click_element :review_preview_toggle
-            click_element :submit_review
+          within_element(:review_bar) do
+            click_element(:review_preview_toggle)
+            click_element(:submit_review)
 
             # After clicking the button, wait for it to disappear
             # before moving on to the next part of the test
-            has_no_element? :submit_review
+            has_no_element?(:submit_review)
           end
         end
 
         def discard_pending_reviews
-          within_element :review_bar do
-            click_element :discard_review
+          within_element(:review_bar) do
+            click_element(:discard_review)
           end
-          click_element :modal_delete_pending_comments
+          click_element(:modal_delete_pending_comments)
         end
 
         def resolve_review_discussion
-          scroll_to_element :start_review
-          check_element :resolve_review_discussion_checkbox
+          scroll_to_element(:start_review_button)
+          check_element(:resolve_review_discussion_checkbox)
         end
 
         def unresolve_review_discussion
-          check_element :unresolve_review_discussion_checkbox
+          check_element(:unresolve_review_discussion_checkbox)
         end
 
         def add_comment_to_diff(text)
@@ -131,7 +145,7 @@ module QA
           end
           all_elements(:new_diff_line, minimum: 1).first.hover
           click_element(:diff_comment)
-          fill_element(:reply_input, text)
+          fill_element(:reply_field, text)
         end
 
         def click_discussions_tab
@@ -160,6 +174,10 @@ module QA
           has_no_text?('Fast-forward merge is not possible')
         end
 
+        def has_file?(file_name)
+          has_element?(:file_name_content, text: file_name)
+        end
+
         def has_merge_button?
           refresh
 
@@ -168,7 +186,7 @@ module QA
 
         def has_pipeline_status?(text)
           # Pipelines can be slow, so we wait a bit longer than the usual 10 seconds
-          has_element?(:merge_request_pipeline_info_content, text: text, wait: 30)
+          has_element?(:merge_request_pipeline_info_content, text: text, wait: 60)
         end
 
         def has_title?(title)
@@ -190,7 +208,7 @@ module QA
             !find_element(:squash_checkbox).disabled?
           end
 
-          click_element :squash_checkbox
+          click_element(:squash_checkbox)
         end
 
         def merge!
@@ -202,7 +220,7 @@ module QA
         end
 
         def merged?
-          has_element?(:merged_status_content, text: 'The changes were merged into', wait: 30)
+          has_element?(:merged_status_content, text: 'The changes were merged into', wait: 60)
         end
 
         # Check if the MR is able to be merged
@@ -235,7 +253,7 @@ module QA
             !find_element(:mr_rebase_button).disabled?
           end
 
-          click_element :mr_rebase_button
+          click_element(:mr_rebase_button)
 
           success = wait_until do
             has_text?('Fast-forward merge without a merge commit')
@@ -251,12 +269,12 @@ module QA
         end
 
         def view_email_patches
-          click_element :download_dropdown
+          click_element(:download_dropdown)
           visit_link_in_element(:download_email_patches)
         end
 
         def view_plain_diff
-          click_element :download_dropdown
+          click_element(:download_dropdown)
           visit_link_in_element(:download_plain_diff)
         end
 
@@ -266,10 +284,6 @@ module QA
           end
         end
 
-        def wait_for_loading
-          has_no_element?(:skeleton_note)
-        end
-
         def click_open_in_web_ide
           click_element(:open_in_web_ide_button)
           wait_for_requests