From 02489bb7cfa5ef57ed259455c0fff3482bee70b3 Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Wed, 29 Jun 2011 12:07:10 -0700
Subject: [PATCH] This should fix CI for real
---
features/step_definitions/oauth_steps.rb | 4 +++-
spec/chubbies/Gemfile.lock | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/features/step_definitions/oauth_steps.rb b/features/step_definitions/oauth_steps.rb
index b40c3a0b8f..69255e20be 100644
--- a/features/step_definitions/oauth_steps.rb
+++ b/features/step_definitions/oauth_steps.rb
@@ -78,7 +78,9 @@ class Chubbies
def self.ensure_bundled
if !(@bundled)
- `cd #{Rails.root}/spec/chubbies/ && BUNDLE_GEMFILE=Gemfile bundle 2> /dev/null 1> /dev/null`
+ Bundler.with_clean_env do
+ `cd #{Rails.root}/spec/chubbies/ && BUNDLE_GEMFILE=Gemfile bundle install`#2> /dev/null 1> /dev/null`
+ end
@bundled = true
end
end
diff --git a/spec/chubbies/Gemfile.lock b/spec/chubbies/Gemfile.lock
index 20f55b348a..ae17d74c6a 100644
--- a/spec/chubbies/Gemfile.lock
+++ b/spec/chubbies/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/diaspora/diaspora-client.git
- revision: 7924e3cc576e54b5ade4014caea8b79e9f1d6343
+ revision: cf3bc4ad714c57cc159dd253413363dd5829f4bb
specs:
diaspora-client (0.0.0)
activerecord
@@ -37,7 +37,7 @@ GEM
rack (>= 1.1.0, < 2)
haml (3.1.2)
i18n (0.6.0)
- json (1.5.3)
+ json (1.4.6)
multi_json (1.0.3)
multipart-post (1.1.2)
oauth2 (0.4.1)
@@ -46,7 +46,7 @@ GEM
rack (1.3.0)
sinatra (1.2.6)
rack (~> 1.1)
- tilt (< 2.0, >= 1.2.2)
+ tilt (>= 1.2.2, < 2.0)
sqlite3 (1.3.3)
tilt (1.3.2)
tzinfo (0.3.28)
--
GitLab