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:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-04-15 00:13:24 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-04-15 00:13:24 +0300
commit6df3cf6b4acbfe83f7a19e40bbd1471af5d6ce95 (patch)
treead732f3108fb02f1e8f95f13cc87edaedbb728b1 /spec/features/user_sees_revert_modal_spec.rb
parent5b62f8e3ee531f63ce3c49cae03e2a618ba51615 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/user_sees_revert_modal_spec.rb')
-rw-r--r--spec/features/user_sees_revert_modal_spec.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/features/user_sees_revert_modal_spec.rb b/spec/features/user_sees_revert_modal_spec.rb
index ae3158e4270..1c754943acb 100644
--- a/spec/features/user_sees_revert_modal_spec.rb
+++ b/spec/features/user_sees_revert_modal_spec.rb
@@ -21,7 +21,9 @@ feature_category: :code_review_workflow do
before do
sign_in(user)
visit(project_merge_request_path(project, merge_request))
- click_button('Merge')
+ page.within('.mr-state-widget') do
+ click_button 'Merge'
+ end
wait_for_requests
end