diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-03 10:02:12 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-03 10:02:27 +0000 |
commit | 01a6adb2b453b852a9348365c4e867d6a36ddeb1 (patch) | |
tree | c48732c5bd6dc8881de252ed147277d49c365d22 /spec/features | |
parent | f617de3476794b7198f07eba70b84fa401eded71 (diff) | |
download | gitlab-ce-01a6adb2b453b852a9348365c4e867d6a36ddeb1.tar.gz |
Add latest changes from gitlab-org/security/gitlab@14-5-stable-ee
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/protected_branches_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/protected_branches_spec.rb b/spec/features/protected_branches_spec.rb index 6fbed21acdb..15ec11c256f 100644 --- a/spec/features/protected_branches_spec.rb +++ b/spec/features/protected_branches_spec.rb @@ -118,12 +118,12 @@ RSpec.describe 'Protected Branches', :js do it "allows creating explicit protected branches" do visit project_protected_branches_path(project) set_defaults - set_protected_branch_name('some-branch') + set_protected_branch_name('some->branch') click_on "Protect" - within(".protected-branches-list") { expect(page).to have_content('some-branch') } + within(".protected-branches-list") { expect(page).to have_content('some->branch') } expect(ProtectedBranch.count).to eq(1) - expect(ProtectedBranch.last.name).to eq('some-branch') + expect(ProtectedBranch.last.name).to eq('some->branch') end it "displays the last commit on the matching branch if it exists" do |