merged @jmmasteys rails_5 branch

2017-07-12 10:24:04 -04:00
parent efad3bb2ab f1a3bc7bcf
commit 386a526742
38 changed files with 85 additions and 438 deletions
@@ -11,8 +11,7 @@ before_install:
  - "if [ $(phantomjs --version) != '2.1.1' ]; then tar -xvf ${PWD}/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C ${PWD}/travis_phantomjs; fi"
  - "phantomjs --version"

-before_script: rake db:setup
-before_script: bundle exec rake db:setup
+before_script: bundle exec rails db:test:prepare
 cache: bundler
 sudo: false
-env: RAILSGOAT_MAINTAINER=true
+env: RAILSGOAT_MAINTAINER=true