From b706edf76f4480ebe7154ca7506c8b5ddccbbefe Mon Sep 17 00:00:00 2001
From: Jonne Hass <mrzyx@mrzyx.de>
Date: Fri, 16 Sep 2011 22:11:34 +0200
Subject: [PATCH] pull in parallel_testing to speed up rspec
- Initally run rake parallel:create
- After each schema change run rake parallel:prepare
- To run rspec super fast run rake parallel:spec
- Todo fix upstreams summary logger
---
Gemfile | 7 ++++---
Gemfile.lock | 4 ++++
config/database.yml.example | 2 +-
spec/parallel_spec.opts | 2 ++
4 files changed, 11 insertions(+), 4 deletions(-)
create mode 100644 spec/parallel_spec.opts
diff --git a/Gemfile b/Gemfile
index 27d7606e4a..787405b0a9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -114,13 +114,13 @@ group :test do
gem 'capybara', '~> 0.3.9'
gem 'cucumber-rails', '0.3.2'
gem 'database_cleaner', '0.6.0'
- gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git'
+ gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git'
#"0.1.0", #:path => '~/workspace/diaspora-client'
gem 'factory_girl_rails'
gem 'fixture_builder', '0.3.0'
gem 'fuubar'
gem 'mongrel', :require => false, :platforms => :ruby_18
- gem 'rspec', '>= 2.0.0'
+ gem 'rspec', '>= 2.0.0'
gem 'rspec-core', '2.6.0'
gem 'rspec-instafail', '>= 0.1.7', :require => false
gem 'rspec-rails', '>= 2.0.0'
@@ -132,7 +132,8 @@ group :development do
gem 'capistrano', '2.5.19', :require => false
gem 'capistrano-ext', '1.2.1', :require => false
gem 'linecache', '0.43', :platforms => :mri_18
- gem 'ruby-debug-base19', '0.11.23' if RUBY_VERSION.include? '1.9.1'
+ gem 'parallel_tests'
+ gem 'ruby-debug-base19', '0.11.23' if RUBY_VERSION.include? '1.9.1'
gem 'ruby-debug19', :platforms => :ruby_19
gem 'ruby-debug', :platforms => :mri_18
gem 'sod', :git => 'git://github.com/MikeSofaer/sod.git', :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index 149054cdb5..0eb89e4b4f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -327,6 +327,9 @@ GEM
oa-openid (= 0.2.6)
open4 (1.1.0)
orm_adapter (0.0.5)
+ parallel (0.5.9)
+ parallel_tests (0.6.1)
+ parallel
polyglot (0.3.2)
pyu-ruby-sasl (0.0.3.3)
rack (1.2.3)
@@ -513,6 +516,7 @@ DEPENDENCIES
oauth2-provider (= 0.0.16)
ohai (= 0.5.8)
omniauth (= 0.2.6)
+ parallel_tests
rails (= 3.0.10)
rails-i18n
redcarpet (= 2.0.0b5)
diff --git a/config/database.yml.example b/config/database.yml.example
index 38798760c9..c09f234f7a 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -33,4 +33,4 @@ production:
test:
<<: *common
- database: "diaspora_test"
+ database: "diaspora_test<%= ENV['TEST_ENV_NUMBER'] %>"
diff --git a/spec/parallel_spec.opts b/spec/parallel_spec.opts
new file mode 100644
index 0000000000..85b0f161ef
--- /dev/null
+++ b/spec/parallel_spec.opts
@@ -0,0 +1,2 @@
+--format progress
+--format ParallelSpecs::SpecSummaryLogger --out tmp/spec_summary.log
--
GitLab