Add latest changes from gitlab-org/gitlab@master

3 files changed, 61 insertions, 11 deletions

diff --git a/spec/lib/gitlab/analytics/cycle_analytics/stage_events/code_stage_start_spec.rb b/spec/lib/gitlab/analytics/cycle_analytics/stage_events/code_stage_start_spec.rb
index fe390289ef6..2809ca2105f 100644
--- a/spec/lib/gitlab/analytics/cycle_analytics/stage_events/code_stage_start_spec.rb
+++ b/spec/lib/gitlab/analytics/cycle_analytics/stage_events/code_stage_start_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe Gitlab::Analytics::CycleAnalytics::StageEvents::CodeStageStart do
 
     other_merge_request = create(:merge_request, source_project: project, source_branch: 'a', target_branch: 'master')
 
-    records = subject.apply_query_customization(MergeRequest.all)
+    records = subject.apply_query_customization(MergeRequest.all).where('merge_requests_closing_issues.issue_id IS NOT NULL')
     expect(records).to eq([merge_request])
     expect(records).not_to include(other_merge_request)
   end
diff --git a/spec/lib/gitlab/ci/pipeline/seed/environment_spec.rb b/spec/lib/gitlab/ci/pipeline/seed/environment_spec.rb
index 0c8a0de2f34..e62bf042fba 100644
--- a/spec/lib/gitlab/ci/pipeline/seed/environment_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/seed/environment_spec.rb
@@ -16,20 +16,37 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Environment do
     subject { seed.to_resource }
 
     shared_examples_for 'returning a correct environment' do
+      let(:expected_auto_stop_in_seconds) do
+        if expected_auto_stop_in
+          ChronicDuration.parse(expected_auto_stop_in).seconds
+        end
+      end
+
       it 'returns a persisted environment object' do
-        expect { subject }.to change { Environment.count }.by(1)
+        freeze_time do
+          expect { subject }.to change { Environment.count }.by(1)
 
-        expect(subject).to be_a(Environment)
-        expect(subject).to be_persisted
-        expect(subject.project).to eq(project)
-        expect(subject.name).to eq(expected_environment_name)
+          expect(subject).to be_a(Environment)
+          expect(subject).to be_persisted
+          expect(subject.project).to eq(project)
+          expect(subject.name).to eq(expected_environment_name)
+          expect(subject.auto_stop_in).to eq(expected_auto_stop_in_seconds)
+        end
       end
 
       context 'when environment has already existed' do
-        let!(:environment) { create(:environment, project: project, name: expected_environment_name) }
+        let!(:environment) do
+          create(:environment,
+            project: project,
+            name: expected_environment_name
+          ).tap do |env|
+            env.auto_stop_in = expected_auto_stop_in
+          end
+        end
 
         it 'returns the existing environment object' do
           expect { subject }.not_to change { Environment.count }
+          expect { subject }.not_to change { environment.auto_stop_at }
 
           expect(subject).to be_persisted
           expect(subject).to eq(environment)
@@ -37,9 +54,10 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Environment do
       end
     end
 
-    context 'when job has environment attribute' do
+    context 'when job has environment name attribute' do
       let(:environment_name) { 'production' }
       let(:expected_environment_name) { 'production' }
+      let(:expected_auto_stop_in) { nil }
 
       let(:attributes) do
         {
@@ -49,11 +67,41 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Environment do
       end
 
       it_behaves_like 'returning a correct environment'
+
+      context 'and job environment also has an auto_stop_in attribute' do
+        let(:environment_auto_stop_in) { '5 minutes' }
+        let(:expected_auto_stop_in) { '5 minutes' }
+
+        let(:attributes) do
+          {
+            environment: environment_name,
+            options: {
+              environment: {
+                name: environment_name,
+                auto_stop_in: environment_auto_stop_in
+              }
+            }
+          }
+        end
+
+        it_behaves_like 'returning a correct environment'
+
+        context 'but the environment auto_stop_in on create flag is disabled' do
+          let(:expected_auto_stop_in) { nil }
+
+          before do
+            stub_feature_flags(environment_auto_stop_start_on_create: false)
+          end
+
+          it_behaves_like 'returning a correct environment'
+        end
+      end
     end
 
     context 'when job starts a review app' do
       let(:environment_name) { 'review/$CI_COMMIT_REF_NAME' }
       let(:expected_environment_name) { "review/#{job.ref}" }
+      let(:expected_auto_stop_in) { nil }
 
       let(:attributes) do
         {
@@ -68,6 +116,7 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Environment do
     context 'when job stops a review app' do
       let(:environment_name) { 'review/$CI_COMMIT_REF_NAME' }
       let(:expected_environment_name) { "review/#{job.ref}" }
+      let(:expected_auto_stop_in) { nil }
 
       let(:attributes) do
         {
diff --git a/spec/support/helpers/require_migration.rb b/spec/support/helpers/require_migration.rb
index f6acd9db21c..c2902aa4ec7 100644
--- a/spec/support/helpers/require_migration.rb
+++ b/spec/support/helpers/require_migration.rb
@@ -14,8 +14,7 @@ class RequireMigration
     end
   end
 
-  FOSS_MIGRATION_FOLDERS = %w[db/migrate db/post_migrate].freeze
-  ALL_MIGRATION_FOLDERS = (FOSS_MIGRATION_FOLDERS + %w[ee/db/geo/migrate ee/db/geo/post_migrate]).freeze
+  MIGRATION_FOLDERS = %w[db/migrate db/post_migrate].freeze
   SPEC_FILE_PATTERN = /.+\/(?<file_name>.+)_spec\.rb/.freeze
 
   class << self
@@ -37,11 +36,13 @@ class RequireMigration
     private
 
     def migration_folders
-      Gitlab.ee? ? ALL_MIGRATION_FOLDERS : FOSS_MIGRATION_FOLDERS
+      MIGRATION_FOLDERS
     end
   end
 end
 
+RequireMigration.prepend_if_ee('EE::RequireMigration')
+
 def require_migration!(file_name = nil)
   location_info = caller_locations.first.path.match(RequireMigration::SPEC_FILE_PATTERN)
   file_name ||= location_info[:file_name]