diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-16 00:15:55 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-16 00:15:55 +0300 |
commit | 73778b9c53d13a2e06a693c30073366deedead8f (patch) | |
tree | d0ccbde07ae68feb9d7cfe68ffeea96ddedf2371 /spec/features | |
parent | 19ccf5e6435280a5fc3abc0748f78fd1ce103890 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/merge_request/user_creates_merge_request_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/merge_request/user_edits_merge_request_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_request/user_creates_merge_request_spec.rb b/spec/features/merge_request/user_creates_merge_request_spec.rb index eab5cee976e..fdc996ef39b 100644 --- a/spec/features/merge_request/user_creates_merge_request_spec.rb +++ b/spec/features/merge_request/user_creates_merge_request_spec.rb @@ -98,7 +98,7 @@ RSpec.describe 'User creates a merge request', :js, feature_category: :code_revi click_button('Create merge request') - expect(page).to have_content(title).and have_content("requested to merge #{forked_project.full_path}:fix into master") + expect(page).to have_content(title).and have_content("• #{forked_project.full_path}:fix ➔ master") end end end diff --git a/spec/features/merge_request/user_edits_merge_request_spec.rb b/spec/features/merge_request/user_edits_merge_request_spec.rb index 584a17ae33d..31b382be611 100644 --- a/spec/features/merge_request/user_edits_merge_request_spec.rb +++ b/spec/features/merge_request/user_edits_merge_request_spec.rb @@ -95,7 +95,7 @@ RSpec.describe 'User edits a merge request', :js, feature_category: :code_review click_button('Save changes') - expect(page).to have_content("requested to merge #{merge_request.source_branch} into merge-test") + expect(page).to have_content("• #{merge_request.source_branch} ➔ merge-test") expect(page).to have_content("changed target branch from #{merge_request.target_branch} to merge-test") end |