Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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.rb6
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