diff options
author | Rémy Coutable <remy@rymai.me> | 2017-07-20 08:07:21 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-07-20 08:07:21 +0000 |
commit | ad56ae0d17780483b3c71625d24074a90b77f354 (patch) | |
tree | 97739ae84a9fc43bebc5b7397eada1002df66572 /spec | |
parent | 1540cc434b66e32f723fff5de3fbc2f7e9480e0b (diff) | |
parent | 1ec5136128364f36f88713f7678188b5d478e6c9 (diff) | |
download | gitlab-ce-ad56ae0d17780483b3c71625d24074a90b77f354.tar.gz |
Merge branch '35253-desc-protected-branches-for-non-member' into 'master'
Hide description about protected branches to non-member
Closes #35253
See merge request !12945
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/projects/branches_spec.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/spec/features/projects/branches_spec.rb b/spec/features/projects/branches_spec.rb index 4fae324d8d5..d18cd3d6adc 100644 --- a/spec/features/projects/branches_spec.rb +++ b/spec/features/projects/branches_spec.rb @@ -24,7 +24,6 @@ describe 'Branches', feature: true do repository.branches_sorted_by(:name).first(20).each do |branch| expect(page).to have_content("#{branch.name}") end - expect(page).to have_content("Protected branches can be managed in project settings") end it 'sorts the branches by name' do @@ -130,6 +129,14 @@ describe 'Branches', feature: true do project.team << [user, :master] end + describe 'Initial branches page' do + it 'shows description for admin' do + visit project_branches_path(project) + + expect(page).to have_content("Protected branches can be managed in project settings") + end + end + describe 'Delete protected branch' do before do visit project_protected_branches_path(project) |