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

fix after rebase

Browse Source
This commit is contained in:
Sven Fuchs 2013-01-26 20:54:58 +01:00
parent b81644acba
commit 7b4712c32c
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Gemfile.lock
View File

@ -45,7 +45,7 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-core.git remote: git://github.com/travis-ci/travis-core.git
revision: c5f4fb9c33d78cd984e041ba6b280191c8b5349c revision: 801d0dee5bd85811afa000f705f34e29ff2c65e9
branch: sf-archive-logs branch: sf-archive-logs
specs: specs:
travis-core (0.0.1) travis-core (0.0.1)
@ -60,7 +60,7 @@ GIT
postmark-rails (~> 0.4.1) postmark-rails (~> 0.4.1)
pusher (~> 0.11.0) pusher (~> 0.11.0)
railties (~> 3.2.11) railties (~> 3.2.11)
rake rake (~> 0.9.2.2)
redis (~> 3.0) redis (~> 3.0)
rollout (~> 1.1.0) rollout (~> 1.1.0)
simple_states (~> 0.1.1) simple_states (~> 0.1.1)
@ -76,7 +76,7 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-support.git remote: git://github.com/travis-ci/travis-support.git
revision: a288008629ae7eab18c529008880d364daca82ce revision: ff712aca1083a588974f835a84c574e6976aeb29
specs: specs:
travis-support (0.0.1) travis-support (0.0.1)
@ -144,7 +144,7 @@ GEM
coderay (1.0.8) coderay (1.0.8)
connection_pool (0.9.3) connection_pool (0.9.3)
daemons (1.1.9) daemons (1.1.9)
dalli (2.6.0) dalli (2.6.2)
data_migrations (0.0.1) data_migrations (0.0.1)
activerecord activerecord
rake rake
@ -221,7 +221,7 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
rake (0.9.6) rake (0.9.2.2)
rdoc (3.12) rdoc (3.12)
json (~> 1.4) json (~> 1.4)
redcarpet (2.2.2) redcarpet (2.2.2)

1
spec/integration/v1/workers_spec.rb
View File

@ -5,7 +5,6 @@ describe 'Workers' do
let(:headers) { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.1+json' } } let(:headers) { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.1+json' } }
it 'GET /workers' do it 'GET /workers' do
Worker.stubs(all: @workers)
response = get '/workers', {}, headers response = get '/workers', {}, headers
response.should deliver_json_for(Worker.all, version: 'v1', type: 'workers') response.should deliver_json_for(Worker.all, version: 'v1', type: 'workers')
end end

1
spec/integration/v2/workers_spec.rb
View File

@ -5,7 +5,6 @@ describe 'Workers' do
let(:headers) { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json' } } let(:headers) { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json' } }
it 'GET /workers' do it 'GET /workers' do
Worker.stubs(all: @workers)
response = get '/workers', {}, headers response = get '/workers', {}, headers
response.should deliver_json_for(Worker.all, version: 'v2', type: 'workers') response.should deliver_json_for(Worker.all, version: 'v2', type: 'workers')
end end