summaryrefslogtreecommitdiff
path: root/spec/features/projects
diff options
context:
space:
mode:
authorTakuya Noguchi <tak.noguchi.iridge@gmail.com>2017-07-19 01:55:48 +0900
committerTakuya Noguchi <tak.noguchi.iridge@gmail.com>2017-07-20 10:16:55 +0900
commit1ec5136128364f36f88713f7678188b5d478e6c9 (patch)
tree9937f1e4cc391bc55c32d9235fd0b9fe9b157598 /spec/features/projects
parent3453bc328465156bf1fdb4c700c7c3b20d0c1967 (diff)
downloadgitlab-ce-1ec5136128364f36f88713f7678188b5d478e6c9.tar.gz
Hide description about protected branches to non-member
Diffstat (limited to 'spec/features/projects')
-rw-r--r--spec/features/projects/branches_spec.rb9
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)