Skip to content

Commit

Permalink
Update Travis CI stuff for webpacker
Browse files Browse the repository at this point in the history
  • Loading branch information
mlt committed Nov 28, 2019
1 parent 9fe45f2 commit aa04408
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
14 changes: 8 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
git:
depth: 1
services:
- postgresql
branches:
only:
- wip_mlt
- rails6
# services:
# - postgresql
addons:
chrome: stable
env:
Expand All @@ -17,6 +13,9 @@ env:
language: ruby
matrix:
include:
- rvm: 2.6
gemfile: gemfiles/rails_5_wp.gemfile
env: WEBPACKER=1
- rvm: 2.4
gemfile: gemfiles/rails_4.gemfile
- rvm: jruby-9.2.7.0
Expand All @@ -32,7 +31,9 @@ matrix:
# env: RAILS_ENV=test_pg
cache:
bundler: true
yarn: true
directories:
- node_modules
- /home/travis/.rvm/
- /home/travis/.chromedriver-helper/
before_install:
Expand All @@ -45,6 +46,7 @@ before_script:
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build
- if [ "x$RAILS_ENV" == "xtest_pg" ]; then psql -c 'create database travis_ci_test;' -U postgres; bundle exec rake -f spec/dummy/Rakefile db:migrate; fi
- if [ "$WEBPACKER" ]; then nvm use 11 && yarn && yarn link && yarn link tabulatr2_ui; fi
script: "bundle exec rspec spec"
after_script:
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
Expand Down
1 change: 1 addition & 0 deletions spec/rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
require 'google-cloud-storage'
end

Capybara.default_max_wait_time = 10
Capybara.javascript_driver = :chrome # :selenium_chrome_headless
Capybara.server = :webrick

Expand Down

0 comments on commit aa04408

Please sign in to comment.