diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 00:06:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-16 00:06:25 +0300 |
commit | 0ff031c7f4e2c7fe1b671b30fef569eb3fbea942 (patch) | |
tree | 0493e9faf4bb9d69c06226901cea12f22714a92a /spec/features/protected_branches_spec.rb | |
parent | 7b8ec6e718331dd1f8330f08f49f01ba2c20b84c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/protected_branches_spec.rb')
-rw-r--r-- | spec/features/protected_branches_spec.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/spec/features/protected_branches_spec.rb b/spec/features/protected_branches_spec.rb index 80937223016..36c5a116b66 100644 --- a/spec/features/protected_branches_spec.rb +++ b/spec/features/protected_branches_spec.rb @@ -92,7 +92,10 @@ describe 'Protected Branches', :js do set_protected_branch_name('some-branch') click_on "Protect" - within(".protected-branches-list") { expect(page).to have_content(commit.id[0..7]) } + within(".protected-branches-list") do + expect(page).not_to have_content("matching") + expect(page).not_to have_content("was deleted") + end end it "displays an error message if the named branch does not exist" do @@ -101,7 +104,7 @@ describe 'Protected Branches', :js do set_protected_branch_name('some-branch') click_on "Protect" - within(".protected-branches-list") { expect(page).to have_content('branch was deleted') } + within(".protected-branches-list") { expect(page).to have_content('Branch was deleted') } end end @@ -127,7 +130,6 @@ describe 'Protected Branches', :js do click_on "Protect" within(".protected-branches-list") do - expect(page).to have_content("Protected branch (2)") expect(page).to have_content("2 matching branches") end end |