From f8df35d338fc42c01352a318ad68cfd522e6b681 Mon Sep 17 00:00:00 2001
From: richie <richie@navigatingcancer.com>
Date: Tue, 11 Oct 2016 22:17:21 -0700
Subject: [PATCH] More tweaks to travis/ci scripts

---
 .gitignore               |   2 +-
 .travis.yml              |   1 +
 ci/test.sh               |   4 +---
 test-app/db/test.sqlite3 | Bin 20480 -> 0 bytes
 4 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 test-app/db/test.sqlite3

diff --git a/.gitignore b/.gitignore
index 963d53d..bba460a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 **/*/tmp
 **/*/log
 **/*/*.gem
-**.*/*.sqlite
+**.*/*.sqlite3
diff --git a/.travis.yml b/.travis.yml
index ece1d2e..b38d980 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,4 +6,5 @@ env:
   - "RAILS_VERSION=4.2.0"
   - "RAILS_VERSION=5.0.0"
 cache: bundler
+install: bundle install
 script: ./ci/test.sh
diff --git a/ci/test.sh b/ci/test.sh
index 21e841d..77249bc 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -3,8 +3,6 @@
 ROOT_PATH=$PWD
 set -e # abort if anything fails
 
-bundle check || bundle
-
 echo '####################'
 echo 'Unit Tests'
 echo '####################'
@@ -29,7 +27,7 @@ echo ''
 
 echo '##### test-app #####'
 cd $ROOT_PATH/test-app
-bundle exec rake db:setup
+bundle exec rake db:migrate db:test:prepare
 bundle exec rspec
 
 # Cleanup
diff --git a/test-app/db/test.sqlite3 b/test-app/db/test.sqlite3
deleted file mode 100644
index 43f9a332ade6711b9cbfe7f283bed22de116758a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20480
zcmeI#%WB&|6b9fKTd8Rvx0SZTtSpjZTWv}y1mdJaF?Hm`m7!jli9JmOmK;mtkgfZ$
zB@pN{^vJcLs!6-*#{36eMn{_4r`7p<)sCzYUngm-t$5A$8RzU&2*#L0=N6r-C{rWP
zt%9!_f4MvC)%Wck`oP(FVtem*A9rWeKtKQj5P$##AOHafKmY;|fWZG0m{**Nds5@`
zT9k~;!z_uWGc(ABw<gwuIJ!x-jV4L9me@M)s%EG}FKAu$lxPJX)E6P2>n=qn5OQr0
zDXQ|`q#4a1y=l4P)@UIIR$q_J+P7;7XSsr~dDd3{7+l=zba<=Ns(*a!iJ%jTpx17D
zm!%i(;UVw;nsGX&qIZxP0!W4?D?XMBv;Fb1n&{XZQBQAv&MU6#@^5A_=Jj}TlPxZ#
zLVvl)<=c-&lJG+HQFX;-w{_9%_QfaF7tLPSX$92jLIt$i<%*Alw2>VfS=bO|hm*vb
z#7be!gUz2)qpcYYG^Iw=vQcb)A7yrzXP<fR<+V8#{Rjv^00Izz00bZa0SG_<0uX=z
z1U6Uz_5TL{Tx<;j5P$##AOHafKmY;|fB*y_uoTGaf4=vF(Sd*f1Rwwb2tWV=5P$##
zAOHafKwu*T_Ib(k>y5W{zwyp*_>KCTZQ2*=|Bd*$*aQS1009U<00Izz00bZa0SG`~
MDR5BsUKZ>BpY>P88~^|S