diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 21:25:58 +0300 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb b/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb index d36abf86518..75912238501 100644 --- a/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb +++ b/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb @@ -32,7 +32,7 @@ RSpec.describe 'create a merge request, allowing commits from members who can me wait_for_requests - expect(page).to have_content('Allows commits from members who can merge to the target branch') + expect(page).to have_content('Members who can merge are allowed to add commits.') end it 'shows a message when one of the projects is private', :sidekiq_might_not_need_inline do @@ -59,7 +59,7 @@ RSpec.describe 'create a merge request, allowing commits from members who can me visit_new_merge_request - expect(page).not_to have_content('Allows commits from members who can merge to the target branch') + expect(page).not_to have_content('The fork project allows commits from members who can write to the target branch.') end end @@ -81,7 +81,7 @@ RSpec.describe 'create a merge request, allowing commits from members who can me it 'hides the option from members' do visit edit_project_merge_request_path(target_project, merge_request) - expect(page).not_to have_content('Allows commits from members who can merge to the target branch') + expect(page).not_to have_content('The fork project allows commits from members who can write to the target branch.') end end end |