Merge branch 'monolith' into vue

2018-08-03 10:07:49 -04:00 · 2018-08-03 10:07:49 -04:00 · fc538d4242
commit fc538d4242
parent 6d884f9e5b c8244554f6
3 changed files with 8 additions and 1 deletions
--- a/config/ci.ini
+++ b/config/ci.ini
@ -1,2 +1,3 @@
 [default]
 PGHOST = postgreshost
+PGDATABASE = atat_test
--- a/script/include
+++ b/script/include
@ -1 +1 @@
-Subproject commit 90a453b2ac4272961b3ed5f7d77d60816a09e092
+Subproject commit 05492977844309215c122e925159f9f8c62014e3
--- a/script/test
+++ b/script/test
@ -6,6 +6,12 @@ source "$(dirname "${0}")"/../script/include/global_header.inc.sh

 export FLASK_ENV=test

+# Set database name
+DATABASE_NAME="atat_test"
+
+# Enable database resetting
+RESET_DB="true"
+
 # Define all relevant python files and directories for this app
 PYTHON_FILES="./app.py ./atst ./config"