1 files changed, 23 insertions, 26 deletions

diff --git a/spec/models/concerns/deployable_spec.rb b/spec/models/concerns/deployable_spec.rb
index 42bed9434f5..f4a1d510f9f 100644
--- a/spec/models/concerns/deployable_spec.rb
+++ b/spec/models/concerns/deployable_spec.rb
@@ -4,51 +4,47 @@ require 'rails_helper'
 
 describe Deployable do
   describe '#create_deployment' do
-    let(:deployment) { job.deployment }
-    let(:environment) { deployment&.environment }
-
-    before do
-      job.reload
-    end
-
     context 'when the deployable object will deploy to production' do
-      let!(:job) { create(:ci_build, :start_review_app) }
+      let(:job) { create(:ci_build, :start_review_app) }
 
       it 'creates a deployment and environment record' do
-        expect(deployment.project).to eq(job.project)
-        expect(deployment.ref).to eq(job.ref)
-        expect(deployment.tag).to eq(job.tag)
-        expect(deployment.sha).to eq(job.sha)
-        expect(deployment.user).to eq(job.user)
-        expect(deployment.deployable).to eq(job)
-        expect(deployment.on_stop).to eq('stop_review_app')
-        expect(environment.name).to eq('review/master')
+        job.create_deployment
+
+        expect(job.deployment.project).to eq(job.project)
+        expect(job.deployment.ref).to eq(job.ref)
+        expect(job.deployment.tag).to eq(job.tag)
+        expect(job.deployment.sha).to eq(job.sha)
+        expect(job.deployment.user).to eq(job.user)
+        expect(job.deployment.deployable).to eq(job)
+        expect(job.deployment.on_stop).to eq('stop_review_app')
+        expect(job.deployment.environment.name).to eq('review/master')
       end
     end
 
     context 'when the deployable object will stop an environment' do
-      let!(:job) { create(:ci_build, :stop_review_app) }
+      let(:job) { create(:ci_build, :stop_review_app) }
 
       it 'does not create a deployment record' do
-        expect(deployment).to be_nil
+        expect { job.create_deployment }.not_to change { job.reload.deployment }.from(nil)
       end
     end
 
     context 'when the deployable object has already had a deployment' do
-      let!(:job) { create(:ci_build, :start_review_app, deployment: race_deployment) }
-      let!(:race_deployment) { create(:deployment, :success) }
+      let(:job) { create(:ci_build, :start_review_app, deployment: race_deployment) }
+      let(:race_deployment) { create(:deployment, :success) }
 
       it 'does not create a new deployment' do
-        expect(deployment).to eq(race_deployment)
+        expect { job.create_deployment }.not_to change { job.reload.deployment }.from(race_deployment)
       end
     end
 
     context 'when the deployable object will not deploy' do
-      let!(:job) { create(:ci_build) }
+      let(:job) { create(:ci_build) }
 
       it 'does not create a deployment and environment record' do
-        expect(deployment).to be_nil
-        expect(environment).to be_nil
+        expect { job.create_deployment }.not_to change { job.reload.deployment }.from(nil)
+
+        expect(job.persisted_environment).to be_nil
       end
     end
 
@@ -68,8 +64,9 @@ describe Deployable do
       end
 
       it 'does not create a deployment and environment record' do
-        expect(deployment).to be_nil
-        expect(environment).to be_nil
+        expect { job.create_deployment }.not_to change { job.reload.deployment }.from(nil)
+
+        expect(job.persisted_environment).to be_nil
       end
     end
   end