post merge pipeline and environments status

2 files changed, 51 insertions, 1 deletions

diff --git a/spec/models/environment_status_spec.rb b/spec/models/environment_status_spec.rb
index f2eb263c98c..e7805d52d75 100644
--- a/spec/models/environment_status_spec.rb
+++ b/spec/models/environment_status_spec.rb
@@ -5,13 +5,15 @@ describe EnvironmentStatus do
   let(:environment)   { deployment.environment}
   let(:project)       { deployment.project }
   let(:merge_request) { create(:merge_request, :deployed_review_app, deployment: deployment) }
+  let(:sha)           { deployment.sha }
 
-  subject(:environment_status) { described_class.new(environment, merge_request) }
+  subject(:environment_status) { described_class.new(environment, merge_request, sha) }
 
   it { is_expected.to delegate_method(:id).to(:environment) }
   it { is_expected.to delegate_method(:name).to(:environment) }
   it { is_expected.to delegate_method(:project).to(:environment) }
   it { is_expected.to delegate_method(:deployed_at).to(:deployment).as(:created_at) }
+  it { is_expected.to delegate_method(:status).to(:deployment) }
 
   describe '#project' do
     subject { environment_status.project }
@@ -58,4 +60,32 @@ describe EnvironmentStatus do
       )
     end
   end
+
+  describe '.for_merge_request' do
+    let(:admin)    { create(:admin) }
+    let(:pipeline) { create(:ci_pipeline, sha: sha) }
+
+    it 'is based on merge_request.head_pipeline' do
+      expect(merge_request).to receive(:head_pipeline).and_return(pipeline)
+      expect(merge_request).not_to receive(:merge_pipeline)
+
+      described_class.for_merge_request(merge_request, admin)
+    end
+  end
+
+  describe '.after_merge_request' do
+    let(:admin)    { create(:admin) }
+    let(:pipeline) { create(:ci_pipeline, sha: sha) }
+
+    before do
+      merge_request.mark_as_merged!
+    end
+
+    it 'is based on merge_request.merge_pipeline' do
+      expect(merge_request).to receive(:merge_pipeline).and_return(pipeline)
+      expect(merge_request).not_to receive(:head_pipeline)
+
+      described_class.after_merge_request(merge_request, admin)
+    end
+  end
 end
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 666d7e69f89..c8943f2d86f 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -1058,6 +1058,26 @@ describe MergeRequest do
     end
   end
 
+  describe '#merge_pipeline' do
+    it 'returns nil when not merged' do
+      expect(subject.merge_pipeline).to be_nil
+    end
+
+    context 'when the MR is merged' do
+      let(:sha)      { subject.target_project.commit.id }
+      let(:pipeline) { create(:ci_empty_pipeline, sha: sha, ref: subject.target_branch, project: subject.target_project) }
+
+      before do
+        subject.mark_as_merged!
+        subject.update_attribute(:merge_commit_sha, pipeline.sha)
+      end
+
+      it 'returns the post-merge pipeline' do
+        expect(subject.merge_pipeline).to eq(pipeline)
+      end
+    end
+  end
+
   describe '#has_ci?' do
     let(:merge_request) { build_stubbed(:merge_request) }