diff --git a/Gemfile b/Gemfile index fe5eb36727d..79060145dee 100644 --- a/Gemfile +++ b/Gemfile @@ -98,7 +98,6 @@ group :development, :test do gem 'i18n-tasks', '~> 1.0' gem 'knapsack' gem 'nokogiri', '~> 1.14.0' - gem 'parallel_tests', '~> 3.8.0' gem 'pg_query', require: false gem 'pry-byebug' gem 'pry-doc' diff --git a/Gemfile.lock b/Gemfile.lock index d6f072de731..108a13e8f7d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -435,8 +435,6 @@ GEM openssl (> 2.0, < 3.1) orm_adapter (0.5.0) parallel (1.22.1) - parallel_tests (3.8.1) - parallel parser (3.2.0.0) ast (~> 2.4.1) pg (1.4.5) @@ -776,7 +774,6 @@ DEPENDENCIES newrelic_rpm (~> 8.0) nokogiri (~> 1.14.0) octokit (>= 4.25.0) - parallel_tests (~> 3.8.0) pg pg_query phonelib diff --git a/Makefile b/Makefile index bce9ab58f6c..6cfceba4535 100644 --- a/Makefile +++ b/Makefile @@ -133,8 +133,8 @@ browsers.json: yarn.lock .browserslistrc ## Generates browsers.json browser supp yarn generate-browsers-json test: export RAILS_ENV := test -test: $(CONFIG) ## Runs RSpec and yarn tests in parallel - bundle exec rake parallel:spec && yarn test +test: $(CONFIG) ## Runs RSpec and yarn tests + bundle exec rspec && yarn test test_serial: export RAILS_ENV := test test_serial: $(CONFIG) ## Runs RSpec and yarn tests serially diff --git a/bin/docker_setup b/bin/docker_setup index 35481c181be..dba5d7549c0 100755 --- a/bin/docker_setup +++ b/bin/docker_setup @@ -63,8 +63,6 @@ Dir.chdir APP_ROOT do run "docker-compose run --rm app bundle exec rake db:environment:set" # This populates the dev database with sample data run "docker-compose run --rm app bundle exec rake dev:prime" - # Create all parallel test databases - run "docker-compose run --rm app bundle exec rake parallel:setup" puts "== Shut down cluster ==" run "docker-compose down" diff --git a/bin/setup b/bin/setup index 215cd696c6e..323d382db4b 100755 --- a/bin/setup +++ b/bin/setup @@ -61,7 +61,6 @@ Dir.chdir APP_ROOT do run 'bin/rake db:reset' run 'bin/rake db:environment:set' run 'bin/rake dev:prime' - run 'bin/rake parallel:setup' puts "\n== Cleaning up old assets ==" run "bin/rake assets:clobber"