From b2717ffca0fd07300414fc9c03f47122e6d4b385 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Tue, 21 Apr 2015 16:40:45 +1000
Subject: [PATCH] Use db:test:load instead of db:test:prepare in CI to avoid
 conflicts between branches

---
 script/run_tests.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/run_tests.sh b/script/run_tests.sh
index 461ca4ecd8..be33fb1bfe 100755
--- a/script/run_tests.sh
+++ b/script/run_tests.sh
@@ -11,8 +11,8 @@ fi
 echo "--- Bundling"
 bundle install
 
-echo "--- Preparing test database"
-bundle exec rake db:test:prepare
+echo "--- Loading test database"
+bundle exec rake db:test:load
 
 echo "--- Running tests"
 bundle exec rspec spec --format progress