diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-31 14:41:25 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-31 14:41:25 +0000 |
commit | 3deb879ff25c2c85bae29e8e820e8cd135662b2b (patch) | |
tree | 05e3fdc47255ab8f64a61b0153f40c4fe4a3d000 /spec | |
parent | 86af3ed55e5a446d1d10168e890ab06d70fe6cbf (diff) | |
parent | afaf6b7459130191c119ede514f060d090efcaf1 (diff) | |
download | gitlab-ce-3deb879ff25c2c85bae29e8e820e8cd135662b2b.tar.gz |
Merge branch 'fix/27479' into 'master'
Remove new branch button for confidential issues
Closes #27479
See merge request !8894
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/issues/new_branch_button_spec.rb | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/spec/features/issues/new_branch_button_spec.rb b/spec/features/issues/new_branch_button_spec.rb index a4d3053d10c..c0ab42c6822 100644 --- a/spec/features/issues/new_branch_button_spec.rb +++ b/spec/features/issues/new_branch_button_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -feature 'Start new branch from an issue', feature: true do +feature 'Start new branch from an issue', feature: true, js: true do let!(:project) { create(:project) } let!(:issue) { create(:issue, project: project) } let!(:user) { create(:user)} @@ -11,7 +11,7 @@ feature 'Start new branch from an issue', feature: true do login_as(user) end - it 'shows the new branch button', js: true do + it 'shows the new branch button' do visit namespace_project_issue_path(project.namespace, project, issue) expect(page).to have_css('#new-branch .available') @@ -34,16 +34,26 @@ feature 'Start new branch from an issue', feature: true do visit namespace_project_issue_path(project.namespace, project, issue) end - it "hides the new branch button", js: true do + it "hides the new branch button" do expect(page).to have_css('#new-branch .unavailable') expect(page).not_to have_css('#new-branch .available') expect(page).to have_content /1 Related Merge Request/ end end + + context 'when issue is confidential' do + it 'hides the new branch button' do + issue = create(:issue, :confidential, project: project) + + visit namespace_project_issue_path(project.namespace, project, issue) + + expect(page).not_to have_css('#new-branch') + end + end end - context "for visiters" do - it 'shows no buttons', js: true do + context 'for visitors' do + it 'shows no buttons' do visit namespace_project_issue_path(project.namespace, project, issue) expect(page).not_to have_css('#new-branch') |