diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-19 14:01:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-19 14:01:45 +0300 |
commit | 9297025d0b7ddf095eb618dfaaab2ff8f2018d8b (patch) | |
tree | 865198c01d1824a9b098127baa3ab980c9cd2c06 /spec/features/merge_request/user_rebases_merge_request_spec.rb | |
parent | 6372471f43ee03c05a7c1f8b0c6ac6b8a7431dbe (diff) |
Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42
Diffstat (limited to 'spec/features/merge_request/user_rebases_merge_request_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_rebases_merge_request_spec.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_rebases_merge_request_spec.rb b/spec/features/merge_request/user_rebases_merge_request_spec.rb index 1b46b4e1d7f..1dc785724d3 100644 --- a/spec/features/merge_request/user_rebases_merge_request_spec.rb +++ b/spec/features/merge_request/user_rebases_merge_request_spec.rb @@ -14,11 +14,15 @@ RSpec.describe "User rebases a merge request", :js, feature_category: :code_revi it "rebases" do visit(merge_request_path(merge_request)) + wait_for_requests + + click_button 'Expand merge checks' + expect(page).to have_button("Rebase") click_button("Rebase") - expect(page).to have_content("Rebase in progress") + expect(find_by_testid('standard-rebase-button')).to have_selector(".gl-spinner") end end |