Fix non-hacking way

2 files changed, 3 insertions, 2 deletions

diff --git a/app/models/concerns/deployable.rb b/app/models/concerns/deployable.rb
index a1bec950665..85db01af18d 100644
--- a/app/models/concerns/deployable.rb
+++ b/app/models/concerns/deployable.rb
@@ -13,14 +13,13 @@ module Deployable
         name: expanded_environment_name
       )
 
-      environment.deployments.create!(
+      create_deployment!(
         project_id: environment.project_id,
         environment: environment,
         ref: ref,
         tag: tag,
         sha: sha,
         user: user,
-        deployable: self,
         on_stop: on_stop)
     end
   end
diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb
index d2322fa4cab..193148d403a 100644
--- a/spec/services/ci/create_pipeline_service_spec.rb
+++ b/spec/services/ci/create_pipeline_service_spec.rb
@@ -403,6 +403,8 @@ describe Ci::CreatePipelineService do
         expect(result).to be_persisted
         expect(Environment.find_by(name: "review/master")).to be_present
         expect(result.builds.first.tag_list).to contain_exactly('hello')
+        expect(result.builds.first.deployment).to be_persisted
+        expect(result.builds.first.deployment.deployable).to be_a(Ci::Build)
       end
     end