From db47c01784df955cff00560f3c4b5454467025dd Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 1 May 2015 09:50:12 +1000
Subject: [PATCH 1/2] Initial config for parallel spec running

---
 .rspec_parallel     | 2 ++
 Gemfile             | 1 +
 Gemfile.lock        | 4 ++++
 config/database.yml | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 .rspec_parallel

diff --git a/.rspec_parallel b/.rspec_parallel
new file mode 100644
index 0000000000..54b33804ae
--- /dev/null
+++ b/.rspec_parallel
@@ -0,0 +1,2 @@
+--format progress
+--format ParallelTests::RSpec::SummaryLogger --out tmp/spec_summary.log
diff --git a/Gemfile b/Gemfile
index b63961a3ef..3a698cf366 100644
--- a/Gemfile
+++ b/Gemfile
@@ -112,4 +112,5 @@ group :development do
   gem 'guard-rails'
   gem 'guard-zeus'
   gem 'guard-rspec'
+  gem 'parallel_tests'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 1b62201120..09c5f866f3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -362,6 +362,9 @@ GEM
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
+    parallel (1.4.1)
+    parallel_tests (1.3.7)
+      parallel
     paypal-sdk-core (0.2.10)
       multi_json (~> 1.0)
       xml-simple
@@ -575,6 +578,7 @@ DEPENDENCIES
   newrelic_rpm
   oj
   paperclip
+  parallel_tests
   pg
   poltergeist
   pry-debugger
diff --git a/config/database.yml b/config/database.yml
index d74ed6256a..7eef2396f9 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -10,7 +10,7 @@ development:
 test:
   adapter: postgresql
   encoding: unicode
-  database: open_food_network_test
+  database: open_food_network_test<%= ENV['TEST_ENV_NUMBER'] %>
   pool: 5
   host: localhost
   username: ofn

From 2b3689fd933f99349f5284c61fc51ff1e875fb34 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 3 Jun 2015 14:29:24 +1000
Subject: [PATCH 2/2] Run CI specs in parallel

---
 script/ci/run_tests.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/script/ci/run_tests.sh b/script/ci/run_tests.sh
index 5539935a8b..9f9cdfa30d 100755
--- a/script/ci/run_tests.sh
+++ b/script/ci/run_tests.sh
@@ -13,7 +13,8 @@ echo "--- Bundling"
 bundle install
 
 echo "--- Loading test database"
-bundle exec rake db:test:load
+bundle exec rake db:drop db:create db:schema:load
+bundle exec rake parallel:drop parallel:create parallel:load_schema
 
 echo "--- Running tests"
-bundle exec rspec spec
+bundle exec rake parallel:spec