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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ public/packs/manifest.json: yarn.lock $(shell find app/javascript -type f) ## Bu
yarn build

test: export RAILS_ENV := test
test: $(CONFIG) public/packs/manifest.json ## Runs RSpec and yarn tests
test: $(CONFIG) ## Runs RSpec and yarn tests
bundle exec rake parallel:spec && yarn test

fast_test: export RAILS_ENV := test
fast_test: public/packs/manifest.json ## Abbreviated test run, runs RSpec tests without accessibility specs
fast_test: ## Abbreviated test run, runs RSpec tests without accessibility specs
bundle exec rspec --exclude-pattern "**/features/accessibility/*_spec.rb"

tmp/$(HOST)-$(PORT).key tmp/$(HOST)-$(PORT).crt: ## Self-signed cert for local HTTPS development
Expand Down
7 changes: 7 additions & 0 deletions spec/rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ class Analytics
end
end

if !ENV['CI']
config.before(:all, js: true) do
puts 'Bundling JavaScript...'
system 'make public/packs/manifest.json'
end
end

config.before(:each) do
I18n.locale = :en
end
Expand Down