Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

1 files changed, 11 insertions, 7 deletions

diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb
index 536abfa5303..2280cc971a7 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb
@@ -28,15 +28,19 @@ module QA
 
         merge_request.visit!
 
-        Page::MergeRequest::Show.perform do |merge_request|
-          expect(merge_request).to have_content('Merge blocked: the source branch must be rebased onto the target branch.')
-          expect(merge_request).to be_fast_forward_not_possible
-          expect(merge_request).not_to have_merge_button
+        Page::MergeRequest::Show.perform do |mr_page|
+          expect(mr_page).to have_content('Merge blocked: the source branch must be rebased onto the target branch.')
+          expect(mr_page).to be_fast_forward_not_possible
+          expect(mr_page).not_to have_merge_button
+          expect(merge_request.project.commits.size).to eq(2)
 
-          merge_request.rebase!
+          mr_page.rebase!
 
-          expect(merge_request).to have_merge_button
-          expect(merge_request).to be_fast_forward_possible
+          expect { mr_page.has_merge_button? }.to eventually_be_truthy.within(max_duration: 60, reload_page: mr_page)
+
+          mr_page.merge!
+
+          expect(merge_request.project.commits.size).to eq(3)
         end
       end
     end