1 files changed, 54 insertions, 1 deletions

diff --git a/spec/lib/gitlab/ci/pipeline/seed/environment_spec.rb b/spec/lib/gitlab/ci/pipeline/seed/environment_spec.rb
index ad89f1f5cda..2b9d8127886 100644
--- a/spec/lib/gitlab/ci/pipeline/seed/environment_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/seed/environment_spec.rb
@@ -5,7 +5,9 @@ require 'spec_helper'
 RSpec.describe Gitlab::Ci::Pipeline::Seed::Environment do
   let_it_be(:project) { create(:project) }
 
-  let(:job) { build(:ci_build, project: project) }
+  let!(:pipeline) { create(:ci_pipeline, project: project) }
+
+  let(:job) { build(:ci_build, project: project, pipeline: pipeline) }
   let(:seed) { described_class.new(job) }
   let(:attributes) { {} }
 
@@ -87,6 +89,28 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Environment do
 
         it_behaves_like 'returning a correct environment'
       end
+
+      context 'and job environment has an auto_stop_in variable attribute' do
+        let(:environment_auto_stop_in) { '10 minutes' }
+        let(:expected_auto_stop_in) { '10 minutes' }
+
+        let(:attributes) do
+          {
+            environment: environment_name,
+            options: {
+              environment: {
+                name: environment_name,
+                auto_stop_in: '$TTL'
+              }
+            },
+            yaml_variables: [
+              { key: "TTL", value: environment_auto_stop_in, public: true }
+            ]
+          }
+        end
+
+        it_behaves_like 'returning a correct environment'
+      end
     end
 
     context 'when job has deployment tier attribute' do
@@ -167,5 +191,34 @@ RSpec.describe Gitlab::Ci::Pipeline::Seed::Environment do
 
       it_behaves_like 'returning a correct environment'
     end
+
+    context 'when merge_request is provided' do
+      let(:environment_name) { 'development' }
+      let(:attributes) { { environment: environment_name, options: { environment: { name: environment_name } } } }
+      let(:merge_request) { create(:merge_request, source_project: project) }
+      let(:seed) { described_class.new(job, merge_request: merge_request) }
+
+      context 'and environment does not exist' do
+        let(:environment_name) { 'review/$CI_COMMIT_REF_NAME' }
+
+        it 'creates an environment associated with the merge request' do
+          expect { subject }.to change { Environment.count }.by(1)
+
+          expect(subject.merge_request).to eq(merge_request)
+        end
+      end
+
+      context 'and environment already exists' do
+        before do
+          create(:environment, project: project, name: environment_name)
+        end
+
+        it 'does not change the merge request associated with the environment' do
+          expect { subject }.not_to change { Environment.count }
+
+          expect(subject.merge_request).to be_nil
+        end
+      end
+    end
   end
 end