Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphael Sofaer <raphael@joindiaspora.com>2011-06-29 22:21:23 +0400
committerRaphael Sofaer <raphael@joindiaspora.com>2011-06-29 22:21:23 +0400
commitd6321d23271116b20e7f3012d27e25d5c51c6aa0 (patch)
treec217a06152b2d9408128a3cff3cd98aaea737927 /features
parent1ced4c502d3838ce1b8988a5760b8c22f1241ab1 (diff)
Bundle in the oauth features, take the source out of the chubbies Gemfile
Diffstat (limited to 'features')
-rw-r--r--features/step_definitions/oauth_steps.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/features/step_definitions/oauth_steps.rb b/features/step_definitions/oauth_steps.rb
index a0793eb31..b40c3a0b8 100644
--- a/features/step_definitions/oauth_steps.rb
+++ b/features/step_definitions/oauth_steps.rb
@@ -59,6 +59,7 @@ class Chubbies
def self.run
@pid = fork do
+ ensure_bundled
Process.exec "cd #{Rails.root}/spec/chubbies/ && BUNDLE_GEMFILE=Gemfile bundle exec rackup -p #{PORT} 2> /dev/null 1> /dev/null"
end
@@ -75,6 +76,13 @@ class Chubbies
`kill -9 #{get_pid}`
end
+ def self.ensure_bundled
+ if !(@bundled)
+ `cd #{Rails.root}/spec/chubbies/ && BUNDLE_GEMFILE=Gemfile bundle 2> /dev/null 1> /dev/null`
+ @bundled = true
+ end
+ end
+
def self.ensure_killed
if !(@killed) && self.running?
self.kill