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

fix the tests

Browse Source
This commit is contained in:
Renée Hendricksen 2016-08-09 12:38:47 -04:00
parent cef7285621
commit 3b64643053
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/travis/api/v3/services/log/find.rb
View File

@ -1,7 +1,7 @@
module Travis::API::V3 module Travis::API::V3
class Services::Log::Find < Service class Services::Log::Find < Service
def run! def run!
job = find(:job) job = check_login_and_find(:job)
query.find(job) query.find(job)
end end
end end

11
spec/lib/travis/config_spec.rb
View File

@ -69,7 +69,16 @@ describe Travis::Config do
:adapter => 'postgresql', :adapter => 'postgresql',
:database => 'travis_test', :database => 'travis_test',
:encoding => 'unicode', :encoding => 'unicode',
:host => 'localhost', :min_messages => 'warning',
:variables => { :statement_timeout => 10000 }
}
end
it 'logs database' do
config.logs_database.should == {
:adapter => 'postgresql',
:database => 'travis_logs_test',
:encoding => 'unicode',
:min_messages => 'warning', :min_messages => 'warning',
:variables => { :statement_timeout => 10000 } :variables => { :statement_timeout => 10000 }
} }

23
spec/v3/services/log/find_spec.rb
View File

@ -1,27 +1,28 @@
require 'spec_helper' require 'spec_helper'
describe Travis::API::V3::Services::Log::Find, set_app: true do describe Travis::API::V3::Services::Log::Find, set_app: true do
let(:user) { Travis::API::V3::Models::User.find_by_login('svenfuchs') } let(:user) { Factory.create(:user) }
let(:repo) { Travis::API::V3::Models::Repository.where(owner_name: user.login, name: 'minimal').first } let(:repo) { Factory.create(:repository, owner_name: user.login, name: 'minimal', owner: user)}
let(:build) { repo.builds.last } let(:build) { Factory.create(:build, repository: repo) }
let(:job) { Travis::API::V3::Models::Build.find(build.id).jobs.last } let(:job) { Travis::API::V3::Models::Job.create(build: build) }
let(:job2) { Travis::API::V3::Models::Job.create} let(:job2) { Travis::API::V3::Models::Job.create(build: build)}
let(:s3job) { Travis::API::V3::Models::Build.find(build.id).jobs.first } let(:s3job) { Travis::API::V3::Models::Job.create(build: build) }
let(:token) { Travis::Api::App::AccessToken.create(user: user, app_id: 1) } let(:token) { Travis::Api::App::AccessToken.create(user: user, app_id: 1) }
let(:headers) { { 'HTTP_AUTHORIZATION' => "token #{token}" } } let(:headers) { { 'HTTP_AUTHORIZATION' => "token #{token}" } }
let(:parsed_body) { JSON.load(body) } let(:parsed_body) { JSON.load(body) }
let(:log) { job.log } let(:log) { Travis::API::V3::Models::Log.create(job: job) }
let(:log2) { job2.log } let(:log2) { Travis::API::V3::Models::Log.create(job: job2) }
let(:s3log) { s3job.log } let(:s3log) { Travis::API::V3::Models::Log.create(job: s3job, content: 'minimal log 1') }
before { Travis::API::V3::AccessControl::LegacyToken.any_instance.stubs(:visible?).returns(true) }
context 'when log stored in db' do context 'when log stored in db' do
describe 'returns log with an array of Log Parts' do describe 'returns log with an array of Log Parts' do
example do example do
log_part = log.log_parts.create(content: "logging it", number: 0) log_part = log.log_parts.create(content: "logging it", number: 0)
get("/v3/job/#{job.id}/log", {}, headers) get("/v3/job/#{log.job.id}/log", {}, headers)
expect(parsed_body).to eq( expect(parsed_body).to eq(
'@href' => "/v3/job/#{job.id}/log", '@href' => "/v3/job/#{log.job.id}/log",
'@representation' => 'standard', '@representation' => 'standard',
'@type' => 'log', '@type' => 'log',
'content' => nil, 'content' => nil,