1 files changed, 9 insertions, 16 deletions

diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index 8f5ac62d127..a0bebf6bd7a 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -19,6 +19,10 @@ module QA
           element :review_bar_content
         end
 
+        view 'app/assets/javascripts/batch_comments/components/draft_note.vue' do
+          element :draft_note_content
+        end
+
         view 'app/assets/javascripts/diffs/components/compare_dropdown_layout.vue' do
           element :dropdown_content
         end
@@ -78,9 +82,9 @@ module QA
 
         view 'app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue' do
           element :merge_button
-          element :fast_forward_message_content
           element :merge_moment_dropdown
           element :merge_immediately_menu_item
+          element :merged_status_content
         end
 
         view 'app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue' do
@@ -115,12 +119,9 @@ module QA
           element :description_content
         end
 
-        view 'app/views/projects/merge_requests/_mr_box.html.haml' do
-          element :title_content, required: true
-        end
-
         view 'app/views/projects/merge_requests/_mr_title.html.haml' do
           element :edit_button
+          element :title_content, required: true
         end
 
         view 'app/views/projects/merge_requests/show.html.haml' do
@@ -153,6 +154,8 @@ module QA
           has_element?(:submit_review_button)
           within_element(:review_bar_content) do
             click_element(:review_preview_dropdown)
+          end
+          within_element(:draft_note_content) do
             click_element(:submit_review_button)
           end
           # After clicking the button, wait for it to disappear
@@ -192,10 +195,6 @@ module QA
           click_element(:edit_button)
         end
 
-        def fast_forward_possible?
-          has_element?(:fast_forward_message_content)
-        end
-
         def fast_forward_not_possible?
           has_element?(:no_fast_forward_message_content)
         end
@@ -265,7 +264,7 @@ module QA
           # To remove page refresh logic if possible
           # We don't raise on failure because this method is used as a predicate matcher
           retry_until(max_attempts: 3, reload: true, raise_on_failure: false) do
-            has_element?(:merged_status_content, text: 'The changes were merged into', wait: 20)
+            has_element?(:merged_status_content, text: /The changes were merged into|Changes merged into/, wait: 20)
           end
         end
 
@@ -316,12 +315,6 @@ module QA
           end
 
           click_element(:mr_rebase_button)
-
-          success = wait_until do
-            fast_forward_possible?
-          end
-
-          raise "Rebase did not appear to be successful" unless success
         end
 
         def merge_immediately!