diff options
author | Kamil TrzciĆski <ayufan@ayufan.eu> | 2017-09-13 14:53:00 +0300 |
---|---|---|
committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-14 16:03:12 +0300 |
commit | 307d37de894912537ad905fe9200471fd5e8f8e8 (patch) | |
tree | 2063925bfd8a806420c77203b0068e963e96b120 /spec/helpers | |
parent | 2f277bb9a0c7f95febaa630f465ea31e3e163bad (diff) |
Merge branch 'zj-auto-devops-banner' into 'master'
AutoDevOps banner hidden on explicit CI config
Closes #37652
See merge request !14207
Diffstat (limited to 'spec/helpers')
-rw-r--r-- | spec/helpers/auto_devops_helper_spec.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/spec/helpers/auto_devops_helper_spec.rb b/spec/helpers/auto_devops_helper_spec.rb index 80d58ff6bf7..5e272af6073 100644 --- a/spec/helpers/auto_devops_helper_spec.rb +++ b/spec/helpers/auto_devops_helper_spec.rb @@ -65,5 +65,21 @@ describe AutoDevopsHelper do it { is_expected.to eq(false) } end + + context 'when master contains a .gitlab-ci.yml file' do + before do + allow(project.repository).to receive(:gitlab_ci_yml).and_return("script: ['test']") + end + + it { is_expected.to eq(false) } + end + + context 'when another service is enabled' do + before do + create(:service, project: project, category: :ci, active: true) + end + + it { is_expected.to eq(false) } + end end end |