suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #193 from travis-ci/cd-v3-parity

Browse Source 
v3 Add :category to broadcast renderer, update spec
This commit is contained in:
carlad 2015-09-23 16:46:29 +02:00
commit faabb0f727
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Gemfile.lock
View File

@ -50,7 +50,7 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-core.git remote: git://github.com/travis-ci/travis-core.git
revision: d76e7aa7bac71737553fe127fe825981b8a2bbf6 revision: c70ff174e2ceddebcf28a1b4fd92de5c52d6c74e
specs: specs:
travis-core (0.0.1) travis-core (0.0.1)
actionmailer (~> 3.2.19) actionmailer (~> 3.2.19)
@ -145,7 +145,7 @@ GEM
descendants_tracker (~> 0.0.4) descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0) ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1) thread_safe (~> 0.3, >= 0.3.1)
backports (3.6.5) backports (3.6.6)
builder (3.0.4) builder (3.0.4)
bunny (0.8.0) bunny (0.8.0)
celluloid (0.16.0) celluloid (0.16.0)
@ -186,7 +186,7 @@ GEM
net-http-pipeline net-http-pipeline
hashr (0.0.22) hashr (0.0.22)
hike (1.2.3) hike (1.2.3)
hitimes (1.2.2) hitimes (1.2.3)
httpclient (2.6.0.1) httpclient (2.6.0.1)
i18n (0.7.0) i18n (0.7.0)
ice_nine (0.11.1) ice_nine (0.11.1)
@ -310,7 +310,7 @@ GEM
timers (4.0.1) timers (4.0.1)
hitimes hitimes
tool (0.2.3) tool (0.2.3)
travis-config (0.1.0) travis-config (0.1.4)
hashr (~> 0.0) hashr (~> 0.0)
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot
@ -369,3 +369,6 @@ DEPENDENCIES
travis-yaml! travis-yaml!
unicorn unicorn
yard-sinatra! yard-sinatra!
BUNDLED WITH
1.10.6

4
lib/travis/api/v3/renderer/broadcast.rb
View File

@ -2,7 +2,7 @@ require 'travis/api/v3/renderer/model_renderer'
module Travis::API::V3 module Travis::API::V3
class Renderer::Broadcast < Renderer::ModelRenderer class Renderer::Broadcast < Renderer::ModelRenderer
representation(:minimal, :id, :recipient_id, :message, :created_at) representation(:minimal, :id, :recipient_id, :message, :created_at, :category)
representation(:standard, :id, :recipient_id, :recipient_type, :kind, :message, :expired, :created_at, :updated_at) representation(:standard, :id, :recipient_id, :recipient_type, :category, :kind, :message, :expired, :created_at, :updated_at)
end end
end end

4
spec/v3/services/broadcasts/for_current_user_spec.rb
View File

@ -36,6 +36,7 @@ describe Travis::API::V3::Services::Broadcasts::ForCurrentUser do
"id" => broadcasts[0].id, "id" => broadcasts[0].id,
"recipient_id" => broadcasts[0].recipient_id, "recipient_id" => broadcasts[0].recipient_id,
"recipient_type" => broadcasts[0].recipient_type, "recipient_type" => broadcasts[0].recipient_type,
"category" => broadcasts[0].category,
"kind" => nil, "kind" => nil,
"message" => broadcasts[0].message, "message" => broadcasts[0].message,
"expired" => nil, "expired" => nil,
@ -47,6 +48,7 @@ describe Travis::API::V3::Services::Broadcasts::ForCurrentUser do
"id" => broadcasts[1].id, "id" => broadcasts[1].id,
"recipient_id" => broadcasts[1].recipient_id, "recipient_id" => broadcasts[1].recipient_id,
"recipient_type" => broadcasts[1].recipient_type, "recipient_type" => broadcasts[1].recipient_type,
"category" => broadcasts[1].category,
"kind" => nil, "kind" => nil,
"message" => broadcasts[1].message, "message" => broadcasts[1].message,
"expired" => nil, "expired" => nil,
@ -58,6 +60,7 @@ describe Travis::API::V3::Services::Broadcasts::ForCurrentUser do
"id" => broadcasts[2].id, "id" => broadcasts[2].id,
"recipient_id" => broadcasts[2].recipient_id, "recipient_id" => broadcasts[2].recipient_id,
"recipient_type" => broadcasts[2].recipient_type, "recipient_type" => broadcasts[2].recipient_type,
"category" => broadcasts[2].category,
"kind" => nil, "kind" => nil,
"message" => broadcasts[2].message, "message" => broadcasts[2].message,
"expired" => nil, "expired" => nil,
@ -69,6 +72,7 @@ describe Travis::API::V3::Services::Broadcasts::ForCurrentUser do
"id" => broadcasts[3].id, "id" => broadcasts[3].id,
"recipient_id" => broadcasts[3].recipient_id, "recipient_id" => broadcasts[3].recipient_id,
"recipient_type" => broadcasts[3].recipient_type, "recipient_type" => broadcasts[3].recipient_type,
"category" => broadcasts[3].category,
"kind" => nil, "kind" => nil,
"message" => broadcasts[3].message, "message" => broadcasts[3].message,
"expired" => nil, "expired" => nil,