Add latest changes from gitlab-org/gitlab@master

3 files changed, 122 insertions, 0 deletions

diff --git a/spec/lib/gitlab/ci/templates/auto_devops_gitlab_ci_yaml_spec.rb b/spec/lib/gitlab/ci/templates/auto_devops_gitlab_ci_yaml_spec.rb
new file mode 100644
index 00000000000..c2f9930056a
--- /dev/null
+++ b/spec/lib/gitlab/ci/templates/auto_devops_gitlab_ci_yaml_spec.rb
@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'Auto-DevOps.gitlab-ci.yml' do
+  subject(:template) { Gitlab::Template::GitlabCiYmlTemplate.find('Auto-DevOps') }
+
+  describe 'the created pipeline' do
+    let(:user) { create(:admin) }
+    let(:default_branch) { 'master' }
+    let(:pipeline_branch) { default_branch }
+    let(:project) { create(:project, :custom_repo, files: { 'README.md' => '' }) }
+    let(:service) { Ci::CreatePipelineService.new(project, user, ref: pipeline_branch ) }
+    let(:pipeline) { service.execute!(:push) }
+    let(:build_names) { pipeline.builds.pluck(:name) }
+
+    before do
+      stub_ci_pipeline_yaml_file(template.content)
+      allow_any_instance_of(Ci::BuildScheduleWorker).to receive(:perform).and_return(true)
+      allow(project).to receive(:default_branch).and_return(default_branch)
+    end
+
+    it 'creates a build and a test job' do
+      expect(build_names).to include('build', 'test')
+    end
+
+    context 'when the project has no active cluster' do
+      it 'only creates a build and a test stage' do
+        expect(pipeline.stages_names).to eq(%w(build test))
+      end
+
+      it 'does not create any deployment-related builds' do
+        expect(build_names).not_to include('production')
+        expect(build_names).not_to include('production_manual')
+        expect(build_names).not_to include('staging')
+        expect(build_names).not_to include('canary')
+        expect(build_names).not_to include('review')
+        expect(build_names).not_to include(a_string_matching(/rollout \d+%/))
+      end
+    end
+
+    context 'when the project has an active cluster' do
+      let(:cluster) { create(:cluster, :project, :provided_by_gcp, projects: [project]) }
+
+      before do
+        allow(cluster).to receive(:active?).and_return(true)
+      end
+
+      describe 'deployment-related builds' do
+        context 'on default branch' do
+          it 'does not include rollout jobs besides production' do
+            expect(build_names).to include('production')
+            expect(build_names).not_to include('production_manual')
+            expect(build_names).not_to include('staging')
+            expect(build_names).not_to include('canary')
+            expect(build_names).not_to include('review')
+            expect(build_names).not_to include(a_string_matching(/rollout \d+%/))
+          end
+
+          context 'when STAGING_ENABLED=1' do
+            before do
+              create(:ci_variable, project: project, key: 'STAGING_ENABLED', value: '1')
+            end
+
+            it 'includes a staging job and a production_manual job' do
+              expect(build_names).not_to include('production')
+              expect(build_names).to include('production_manual')
+              expect(build_names).to include('staging')
+              expect(build_names).not_to include('canary')
+              expect(build_names).not_to include('review')
+              expect(build_names).not_to include(a_string_matching(/rollout \d+%/))
+            end
+          end
+
+          context 'when CANARY_ENABLED=1' do
+            before do
+              create(:ci_variable, project: project, key: 'CANARY_ENABLED', value: '1')
+            end
+
+            it 'includes a canary job and a production_manual job' do
+              expect(build_names).not_to include('production')
+              expect(build_names).to include('production_manual')
+              expect(build_names).not_to include('staging')
+              expect(build_names).to include('canary')
+              expect(build_names).not_to include('review')
+              expect(build_names).not_to include(a_string_matching(/rollout \d+%/))
+            end
+          end
+        end
+
+        context 'outside of default branch' do
+          let(:pipeline_branch) { 'patch-1' }
+
+          before do
+            project.repository.create_branch(pipeline_branch)
+          end
+
+          it 'does not include rollout jobs besides review' do
+            expect(build_names).not_to include('production')
+            expect(build_names).not_to include('production_manual')
+            expect(build_names).not_to include('staging')
+            expect(build_names).not_to include('canary')
+            expect(build_names).to include('review')
+            expect(build_names).not_to include(a_string_matching(/rollout \d+%/))
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb b/spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb
index 5b1a17e734d..ee3c99afdf1 100644
--- a/spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb
+++ b/spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb
@@ -279,5 +279,11 @@ describe Gitlab::DatabaseImporters::SelfMonitoring::Project::CreateService do
         end
       end
     end
+
+    it "tracks successful install" do
+      expect(Gitlab::Tracking).to receive(:event).with("self_monitoring", "project_created")
+
+      result
+    end
   end
 end
diff --git a/spec/lib/gitlab/regex_spec.rb b/spec/lib/gitlab/regex_spec.rb
index 1397add9f5a..c580b46cf8d 100644
--- a/spec/lib/gitlab/regex_spec.rb
+++ b/spec/lib/gitlab/regex_spec.rb
@@ -61,6 +61,12 @@ describe Gitlab::Regex do
     it { is_expected.to match('my/image') }
     it { is_expected.to match('my/awesome/image-1') }
     it { is_expected.to match('my/awesome/image.test') }
+    it { is_expected.to match('my/awesome/image--test') }
+    # docker distribution allows for infinite `-`
+    # https://github.com/docker/distribution/blob/master/reference/regexp.go#L13
+    # but we have a range of 0,10 to add a reasonable limit.
+    it { is_expected.not_to match('my/image-----------test') }
+    it { is_expected.not_to match('my/image-.test') }
     it { is_expected.not_to match('.my/image') }
     it { is_expected.not_to match('my/image.') }
   end