Skip to content
Snippets Groups Projects
Commit 7ef156a2 authored by Kamil Trzcinski's avatar Kamil Trzcinski
Browse files

Add author to statuses

parent 88749476
No related branches found
No related tags found
1 merge request!1530Implement Commit Status API
Loading
Loading
@@ -9,6 +9,8 @@ class CommitStatus < ActiveRecord::Base
 
validates_presence_of :name
 
alias_attribute :author, :user
scope :running, ->() { where(status: 'running') }
scope :pending, ->() { where(status: 'pending') }
scope :success, ->() { where(status: 'success') }
Loading
Loading
Loading
Loading
@@ -52,7 +52,7 @@ module API
 
name = params[:name] || params[:context]
status = GenericCommitStatus.running_or_pending.find_by(commit: ci_commit, name: name, ref: params[:ref])
status = GenericCommitStatus.new(commit: ci_commit) unless status
status = GenericCommitStatus.new(commit: ci_commit, user: current_user) unless status
status.update(attrs)
 
case params[:state].to_s
Loading
Loading
Loading
Loading
@@ -232,6 +232,7 @@ module API
class CommitStatus < Grape::Entity
expose :id, :sha, :ref, :status, :name, :target_url, :description,
:created_at, :started_at, :finished_at
expose :author, using: Entities::UserBasic
end
 
class Event < Grape::Entity
Loading
Loading
Loading
Loading
@@ -18,6 +18,13 @@ describe CommitStatus do
it { is_expected.to respond_to :running? }
it { is_expected.to respond_to :pending? }
 
describe :author do
subject { commit_status.author }
before { commit_status.author = User.new }
it { is_expected.to eq(commit_status.user) }
end
describe :started? do
subject { commit_status.started? }
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment