Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 0 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions bin/docker_setup
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down