Auto-merged master into cd-v3-parity on deployment.

This commit is contained in:
carlad 2015-10-28 15:40:26 +01:00
commit 59d3090da6
3 changed files with 8 additions and 5 deletions

View File

@ -50,7 +50,11 @@ module Travis::API::V3
resource :owner do
route '/owner/({owner.login}|{user.login}|{organization.login}|github_id/{owner.github_id})'
get :find
get :repositories, '/repos'
resource :repositories do
route '/repos'
get :for_owner
end
end
resource :repositories do

View File

@ -1,11 +1,10 @@
module Travis::API::V3
class Services::Owner::Repositories < Service
class Services::Repositories::ForOwner < Service
params :active, :private, prefix: :repository
result_type :repositories
paginate(default_limit: 100)
def run!
unfiltered = query(:repositories).for_owner(find(:owner))
unfiltered = query.for_owner(find(:owner))
access_control.visible_repositories(unfiltered)
end
end

View File

@ -1,6 +1,6 @@
require 'spec_helper'
describe Travis::API::V3::Services::Owner::Repositories do
describe Travis::API::V3::Services::Repositories::ForOwner do
let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
let(:build) { repo.builds.first }
let(:jobs) { Travis::API::V3::Models::Build.find(build.id).jobs }