Merge branch '10-0-stable-prepare-rc3' into '10-0-stable'

Prepare 10.0 RC3 release

See merge request gitlab-org/gitlab-ce!14266

1 files changed, 26 insertions, 0 deletions

diff --git a/spec/helpers/auto_devops_helper_spec.rb b/spec/helpers/auto_devops_helper_spec.rb
index b6d892548ef..5e272af6073 100644
--- a/spec/helpers/auto_devops_helper_spec.rb
+++ b/spec/helpers/auto_devops_helper_spec.rb
@@ -10,6 +10,8 @@ describe AutoDevopsHelper do
     before do
       allow(helper).to receive(:can?).with(user, :admin_pipeline, project) { allowed }
       allow(helper).to receive(:current_user) { user }
+
+      Feature.get(:auto_devops_banner_disabled).disable
     end
 
     subject { helper.show_auto_devops_callout?(project) }
@@ -18,6 +20,14 @@ describe AutoDevopsHelper do
       it { is_expected.to eq(true) }
     end
 
+    context 'when the banner is disabled by feature flag' do
+      it 'allows the feature flag to disable' do
+        Feature.get(:auto_devops_banner_disabled).enable
+
+        expect(subject).to be(false)
+      end
+    end
+
     context 'when dismissed' do
       before do
         helper.request.cookies[:auto_devops_settings_dismissed] = 'true'
@@ -55,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