Merge branch 'zj-auto-devops-banner' into 'master'

AutoDevOps banner hidden on explicit CI config

Closes #37652

See merge request !14207

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