diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 10:33:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 10:33:21 +0300 |
commit | 36a59d088eca61b834191dacea009677a96c052f (patch) | |
tree | e4f33972dab5d8ef79e3944a9f403035fceea43f /spec/features/merge_request/user_merges_merge_request_spec.rb | |
parent | a1761f15ec2cae7c7f7bbda39a75494add0dfd6f (diff) |
Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42
Diffstat (limited to 'spec/features/merge_request/user_merges_merge_request_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_merges_merge_request_spec.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/features/merge_request/user_merges_merge_request_spec.rb b/spec/features/merge_request/user_merges_merge_request_spec.rb index a861ca2eea5..6a9a30953df 100644 --- a/spec/features/merge_request/user_merges_merge_request_spec.rb +++ b/spec/features/merge_request/user_merges_merge_request_spec.rb @@ -17,9 +17,7 @@ RSpec.describe "User merges a merge request", :js do click_button("Merge") end - page.within(".status-box") do - expect(page).to have_content("Merged") - end + expect(page).to have_selector('.gl-badge', text: 'Merged') end end @@ -27,6 +25,7 @@ RSpec.describe "User merges a merge request", :js do let(:project) { create(:project, :public, :repository, merge_requests_ff_only_enabled: true) } before do + stub_feature_flags(restructured_mr_widget: false) visit(merge_request_path(merge_request)) end |