From 1b9bc9b039254300fcc957977033f4bdadd655b8 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Thu, 11 Oct 2012 14:07:51 +0200
Subject: [PATCH] fix specs for cors

---
 Gemfile.lock                       | 4 ++--
 spec/integration/v2/builds_spec.rb | 2 +-
 spec/unit/middleware/cors_spec.rb  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 87145c30..fecac193 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,7 +40,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 1b8e433f7a1eb8cc3aaa24b3cc2e14a0176218f6
+  revision: 1448d4b1505b38014d3083f45500d371c8ec999f
   branch: sf-travis-api
   specs:
     travis-core (0.0.1)
@@ -148,7 +148,7 @@ GEM
       avl_tree (~> 1.1.2)
       hitimes (~> 1.1)
     mime-types (1.19)
-    mocha (0.12.6)
+    mocha (0.12.7)
       metaclass (~> 0.0.1)
     multi_json (1.3.6)
     multipart-post (1.1.5)
diff --git a/spec/integration/v2/builds_spec.rb b/spec/integration/v2/builds_spec.rb
index 5b999fae..1f948fb8 100644
--- a/spec/integration/v2/builds_spec.rb
+++ b/spec/integration/v2/builds_spec.rb
@@ -24,7 +24,7 @@ describe 'Builds' do
 
   it 'GET /repos/svenfuchs/minimal/builds' do
     response = get '/repos/svenfuchs/minimal/builds', {}, headers
-    response.should deliver_json_for(repo.builds, version: 'v2', type: :builds)
+    response.should deliver_json_for(repo.builds.order('id DESC'), version: 'v2', type: :builds)
   end
 
   it 'GET /repos/svenfuchs/minimal/builds/1' do
diff --git a/spec/unit/middleware/cors_spec.rb b/spec/unit/middleware/cors_spec.rb
index 21dee0f7..16d565bd 100644
--- a/spec/unit/middleware/cors_spec.rb
+++ b/spec/unit/middleware/cors_spec.rb
@@ -20,7 +20,7 @@ describe Travis::Api::App::Middleware::Cors do
     end
 
     it 'sets Access-Control-Expose-Headers' do
-      headers['Access-Control-Expose-Headers'].should == "Content-Type"
+      headers['Access-Control-Expose-Headers'].should == "Content-Type, Cache-Control, Expires, Etag, Last-Modified"
     end
   end
 
@@ -36,7 +36,7 @@ describe Travis::Api::App::Middleware::Cors do
     end
 
     it 'sets Access-Control-Expose-Headers' do
-      headers['Access-Control-Expose-Headers'].should == "Content-Type"
+      headers['Access-Control-Expose-Headers'].should == "Content-Type, Cache-Control, Expires, Etag, Last-Modified"
     end
 
     it 'sets Access-Control-Allow-Methods' do
@@ -44,7 +44,7 @@ describe Travis::Api::App::Middleware::Cors do
     end
 
     it 'sets Access-Control-Allow-Headers' do
-      headers['Access-Control-Allow-Headers'].should == "Content-Type, Authorization, Accept"
+      headers['Access-Control-Allow-Headers'].should == "Content-Type, Authorization, Accept, If-None-Match, If-Modified-Since"
     end
   end
 end