Merge pull request #2853 from mkllnk/remove-parallel-tests

Remove parallel tests

.rspec_parallel

@@ -1,4 +0,0 @@
---format Fuubar
---format ParallelTests::RSpec::SummaryLogger --out tmp/spec_summary.log
---format ParallelTests::RSpec::RuntimeLogger --out tmp/parallel_runtime_rspec.log
---tag ~performance

Gemfile

@@ -142,7 +142,6 @@ group :development do
   gem 'guard-livereload'
   gem 'guard-rails'
   gem 'guard-rspec', '~> 4.7.3'
-  gem 'parallel_tests'
   gem 'rubocop', '>= 0.49.1'
 
   # 1.0.9 fixed openssl issues on macOS https://github.com/eventmachine/eventmachine/issues/602

Gemfile.lock

@@ -551,8 +551,6 @@ GEM
       cocaine (~> 0.5.3)
       mime-types
     parallel (1.11.2)
-    parallel_tests (2.14.1)
-      parallel
     parser (2.5.1.0)
       ast (~> 2.4.0)
     paypal-sdk-core (0.2.10)
@@ -809,7 +807,6 @@ DEPENDENCIES
   oj
   paper_trail (~> 3.0.8)
   paperclip
-  parallel_tests
   pg
   poltergeist (>= 1.16.0)
   pry-byebug (>= 3.4.3)

config/database.yml

@@ -10,7 +10,7 @@ development:
 test:
   adapter: postgresql
   encoding: unicode
-  database: open_food_network_test<%= ENV['TEST_ENV_NUMBER'] %>
+  database: open_food_network_test
   pool: 5
   host: localhost
   username: ofn

script/ci/includes.sh

@@ -1,10 +1,3 @@
-function load_environment {
-    source /var/lib/jenkins/.rvm/environments/ruby-2.1.5
-    if [ ! -f config/application.yml ]; then
-        ln -s application.yml.example config/application.yml
-    fi
-}
-
 function require_env_vars {
     for var in "$@"; do
       eval value=\$$var
@@ -66,12 +59,6 @@ function get_ofn_commit {
     fi
 }
 
-function checkout_ofn_commit {
-    OFN_COMMIT=`buildkite-agent meta-data get "openfoodnetwork:git:commit"`
-    echo "Checking out stored commit $OFN_COMMIT"
-    git checkout -qf "$OFN_COMMIT"
-}
-
 function drop_and_recreate_database {
     # Adapted from: http://stackoverflow.com/questions/12924466/capistrano-with-postgresql-error-database-is-being-accessed-by-other-users
     DB=$1

script/ci/run_js_tests.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo "--- Loading environment"
-source ./script/ci/includes.sh
-load_environment
-checkout_ofn_commit
-
-echo "--- Verifying branch is based on current master"
-exit_unless_master_merged
-
-echo "--- Bundling"
-bundle install
-
-echo "--- Running tests"
-./script/karma run

script/ci/run_tests.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -e
-
-echo "--- Loading environment"
-source ./script/ci/includes.sh
-load_environment
-checkout_ofn_commit
-
-echo "--- Verifying branch is based on current master"
-exit_unless_master_merged
-
-echo "--- Bundling"
-bundle install
-
-echo "--- Loading test database"
-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 rake parallel:spec