Commit b706edf7 authored by Jonne Hass's avatar Jonne Hass

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
parent fcff5a67
......@@ -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
......
......@@ -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)
......
......@@ -33,4 +33,4 @@ production:
test:
<<: *common
database: "diaspora_test"
database: "diaspora_test<%= ENV['TEST_ENV_NUMBER'] %>"
--format progress
--format ParallelSpecs::SpecSummaryLogger --out tmp/spec_summary.log
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment