From 7b4712c32cbe22bb669db639c14d954e2bb01ebc Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Sat, 26 Jan 2013 20:54:58 +0100
Subject: [PATCH] fix after rebase

---
 Gemfile.lock                        | 10 +++++-----
 spec/integration/v1/workers_spec.rb |  1 -
 spec/integration/v2/workers_spec.rb |  1 -
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index abc22ad6..d447a621 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,7 +45,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: c5f4fb9c33d78cd984e041ba6b280191c8b5349c
+  revision: 801d0dee5bd85811afa000f705f34e29ff2c65e9
   branch: sf-archive-logs
   specs:
     travis-core (0.0.1)
@@ -60,7 +60,7 @@ GIT
       postmark-rails (~> 0.4.1)
       pusher (~> 0.11.0)
       railties (~> 3.2.11)
-      rake
+      rake (~> 0.9.2.2)
       redis (~> 3.0)
       rollout (~> 1.1.0)
       simple_states (~> 0.1.1)
@@ -76,7 +76,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-support.git
-  revision: a288008629ae7eab18c529008880d364daca82ce
+  revision: ff712aca1083a588974f835a84c574e6976aeb29
   specs:
     travis-support (0.0.1)
 
@@ -144,7 +144,7 @@ GEM
     coderay (1.0.8)
     connection_pool (0.9.3)
     daemons (1.1.9)
-    dalli (2.6.0)
+    dalli (2.6.2)
     data_migrations (0.0.1)
       activerecord
       rake
@@ -221,7 +221,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.6)
+    rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
     redcarpet (2.2.2)
diff --git a/spec/integration/v1/workers_spec.rb b/spec/integration/v1/workers_spec.rb
index 22bb8683..1c897384 100644
--- a/spec/integration/v1/workers_spec.rb
+++ b/spec/integration/v1/workers_spec.rb
@@ -5,7 +5,6 @@ describe 'Workers' do
   let(:headers)  { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.1+json' } }
 
   it 'GET /workers' do
-    Worker.stubs(all: @workers)
     response = get '/workers', {}, headers
     response.should deliver_json_for(Worker.all, version: 'v1', type: 'workers')
   end
diff --git a/spec/integration/v2/workers_spec.rb b/spec/integration/v2/workers_spec.rb
index 047dff94..120934a4 100644
--- a/spec/integration/v2/workers_spec.rb
+++ b/spec/integration/v2/workers_spec.rb
@@ -5,7 +5,6 @@ describe 'Workers' do
   let(:headers)  { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json' } }
 
   it 'GET /workers' do
-    Worker.stubs(all: @workers)
     response = get '/workers', {}, headers
     response.should deliver_json_for(Worker.all, version: 'v2', type: 'workers')
   end