Fix builds API response not including commit data

app/models/commit_status.rb

@@ -90,4 +90,12 @@ class CommitStatus < ActiveRecord::Base
   def stuck?
     false
   end
+
+  ##
+  # Deprecated, this should be removed in 9.0 in favor of exposing
+  # entire pipeline in API.
+  #
+  def commit
+    pipeline.try(:commit_data)
+  end
 end

lib/api/entities.rb

@@ -445,11 +445,7 @@ module API
       expose :created_at, :started_at, :finished_at
       expose :user, with: User
       expose :artifacts_file, using: BuildArtifactFile, if: -> (build, opts) { build.artifacts? }
-      expose :commit, with: RepoCommit do |repo_obj, _options|
-        if repo_obj.respond_to?(:commit)
-          repo_obj.commit.commit_data
-        end
-      end
+      expose :commit, with: RepoCommit
       expose :runner, with: Runner
     end
 

spec/models/build_spec.rb

@@ -2,7 +2,12 @@ require 'spec_helper'
 
 describe Ci::Build, models: true do
   let(:project) { create(:project) }
-  let(:pipeline) { create(:ci_pipeline, project: project) }
+
+  let(:pipeline) do
+    create(:ci_pipeline, project: project,
+                         sha: project.commit.id)
+  end
+
   let(:build) { create(:ci_build, pipeline: pipeline) }
 
   it { is_expected.to validate_presence_of :ref }
@@ -658,4 +663,10 @@ describe Ci::Build, models: true do
       end
     end
   end
+
+  describe '#commit' do
+    it 'returns commit pipeline has been created for' do
+      expect(build.commit).to eq project.commit
+    end
+  end
 end

spec/models/commit_status_spec.rb

 require 'spec_helper'
 
 describe CommitStatus, models: true do
-  let(:pipeline) { FactoryGirl.create :ci_pipeline }
-  let(:commit_status) { FactoryGirl.create :commit_status, pipeline: pipeline }
+  let(:project) { create(:project) }
+
+  let(:pipeline) do
+    create(:ci_pipeline, project: project, sha: project.commit.id)
+  end
+
+  let(:commit_status) { create(:commit_status, pipeline: pipeline) }
 
   it { is_expected.to belong_to(:pipeline) }
   it { is_expected.to belong_to(:user) }
@@ -13,7 +18,7 @@ describe CommitStatus, models: true do
 
   it { is_expected.to delegate_method(:sha).to(:pipeline) }
   it { is_expected.to delegate_method(:short_sha).to(:pipeline) }
-  
+
   it { is_expected.to respond_to :success? }
   it { is_expected.to respond_to :failed? }
   it { is_expected.to respond_to :running? }
@@ -116,7 +121,7 @@ describe CommitStatus, models: true do
       it { is_expected.to be > 0.0 }
     end
   end
-  
+
   describe :latest do
     subject { CommitStatus.latest.order(:id) }
 
@@ -198,4 +203,10 @@ describe CommitStatus, models: true do
       end
     end
   end
+
+  describe '#commit' do
+    it 'returns commit pipeline has been created for' do
+      expect(commit_status.commit).to eq project.commit
+    end
+  end
 end

spec/requests/api/builds_spec.rb

@@ -9,8 +9,8 @@ describe API::API, api: true  do
   let!(:project) { create(:project, creator_id: user.id) }
   let!(:developer) { create(:project_member, :developer, user: user, project: project) }
   let!(:reporter) { create(:project_member, :reporter, user: user2, project: project) }
-  let(:pipeline) { create(:ci_pipeline, project: project)}
-  let(:build) { create(:ci_build, pipeline: pipeline) }
+  let!(:pipeline) { create(:ci_pipeline, project: project, sha: project.commit.id) }
+  let!(:build) { create(:ci_build, pipeline: pipeline) }
 
   describe 'GET /projects/:id/builds ' do
     let(:query) { '' }
@@ -23,6 +23,11 @@ describe API::API, api: true  do
         expect(json_response).to be_an Array
       end
 
+      it 'returns correct values' do
+        expect(json_response).not_to be_empty
+        expect(json_response.first['commit']['id']).to eq project.commit.id
+      end
+
       context 'filter project with one scope element' do
         let(:query) { 'scope=pending' }
 
@@ -132,7 +137,7 @@ describe API::API, api: true  do
 
   describe 'GET /projects/:id/builds/:build_id/trace' do
     let(:build) { create(:ci_build, :trace, pipeline: pipeline) }
-    
+
     before { get api("/projects/#{project.id}/builds/#{build.id}/trace", api_user) }
 
     context 'authorized user' do