Fix create_trigger_request_service_specrefactor-build-service

3 files changed, 8 insertions, 7 deletions

diff --git a/app/services/ci/create_trigger_request_service.rb b/app/services/ci/create_trigger_request_service.rb
index ea82dbb2bf4..4b86cb0a1f5 100644
--- a/app/services/ci/create_trigger_request_service.rb
+++ b/app/services/ci/create_trigger_request_service.rb
@@ -10,7 +10,8 @@ module Ci
       ci_commit = project.gl_project.ensure_ci_commit(commit.sha)
 
       trigger_request = trigger.trigger_requests.create!(
-        variables: variables
+        variables: variables,
+        commit: ci_commit,
       )
 
       if ci_commit.create_builds(ref, tag, nil, trigger_request)
diff --git a/spec/requests/ci/api/triggers_spec.rb b/spec/requests/ci/api/triggers_spec.rb
index c98a74dcc2c..93617fc4b3f 100644
--- a/spec/requests/ci/api/triggers_spec.rb
+++ b/spec/requests/ci/api/triggers_spec.rb
@@ -5,8 +5,8 @@ describe Ci::API::API do
 
   describe 'POST /projects/:project_id/refs/:ref/trigger' do
     let!(:trigger_token) { 'secure token' }
-    let!(:project) { FactoryGirl.create(:ci_project) }
-    let!(:gl_project) { FactoryGirl.create(:project, gitlab_ci_project: project) }
+    let!(:gl_project) { FactoryGirl.create(:project) }
+    let!(:project) { FactoryGirl.create(:ci_project, gl_project: gl_project) }
     let!(:project2) { FactoryGirl.create(:ci_project) }
     let!(:trigger) { FactoryGirl.create(:ci_trigger, project: project, token: trigger_token) }
     let(:options) do
diff --git a/spec/services/ci/create_trigger_request_service_spec.rb b/spec/services/ci/create_trigger_request_service_spec.rb
index 7aa1912b2a3..fcafae38644 100644
--- a/spec/services/ci/create_trigger_request_service_spec.rb
+++ b/spec/services/ci/create_trigger_request_service_spec.rb
@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe Ci::CreateTriggerRequestService do
   let(:service) { Ci::CreateTriggerRequestService.new }
-  let(:project) { FactoryGirl.create :ci_project }
-  let(:gl_project) { FactoryGirl.create :project, gitlab_ci_project: project }
-  let(:trigger) { FactoryGirl.create :ci_trigger, project: project }
+  let(:gl_project) { create(:project) }
+  let(:project) { create(:ci_project, gl_project: gl_project) }
+  let(:trigger) { create(:ci_trigger, project: project) }
 
   before do
     stub_ci_commit_to_return_yaml_file
@@ -15,7 +15,7 @@ describe Ci::CreateTriggerRequestService do
       subject { service.execute(project, trigger, 'master') }
 
       it { expect(subject).to be_kind_of(Ci::TriggerRequest) }
-      it { expect(subject.commit).to be_kind_of(Ci::Commit) }
+      it { expect(subject.builds.first).to be_kind_of(Ci::Build) }
     end
 
     context 'no commit for ref' do