Merge branch 'dev' into rrt/dev

.travis.yml

@@ -13,7 +13,6 @@ addons:
     organization: "sartography"
 
 before_install:
-  - cp config/travis-testing.py config/testing.py
   - psql -c 'create database crc_test;' -U postgres
 
 install:
@@ -22,7 +21,9 @@ install:
   - pipenv install
 
 env:
-  - PB_BASE_URL='http://workflow.sartography.com:5001/pb/'
+  global:
+    - TESTING=true
+    - PB_ENABLED=false
 
 script:
   - pipenv run coverage run -m pytest

config/testing.py

@@ -6,13 +6,13 @@ basedir = os.path.abspath(os.path.dirname(__file__))
 NAME = "CR Connect Workflow"
 TESTING = True
 TOKEN_AUTH_SECRET_KEY = "Shhhh!!! This is secret!  And better darn well not show up in prod."
-PB_ENABLED = False
 
 # This is here, for when we are running the E2E Tests in the frontend code bases.
 # which will set the TESTING envronment to true, causing this to execute, but we need
 # to respect the environment variables in that case.
 # when running locally the defaults apply, meaning we use crc_test for doing the tests
 # locally, and we don't over-write the database.  Did you read this far? Have a cookie!
+PB_ENABLED = environ.get('PB_ENABLED', default="false") == "true"
 DB_HOST = environ.get('DB_HOST', default="localhost")
 DB_PORT = environ.get('DB_PORT', default="5432")
 DB_NAME = environ.get('DB_NAME', default="crc_test")

config/travis-testing.py

@@ -1,15 +0,0 @@
-import os
-basedir = os.path.abspath(os.path.dirname(__file__))
-
-NAME = "CR Connect Workflow"
-TESTING = True
-SQLALCHEMY_DATABASE_URI = "postgresql://postgres:@localhost:5432/crc_test"
-TOKEN_AUTH_TTL_HOURS = 2
-TOKEN_AUTH_SECRET_KEY = "Shhhh!!! This is secret!  And better darn well not show up in prod."
-FRONTEND_AUTH_CALLBACK = "http://localhost:4200/session"  # Not Required
-PB_ENABLED = False
-
-print('+++ USING TRAVIS TESTING CONFIG: +++')
-print('SQLALCHEMY_DATABASE_URI = ', SQLALCHEMY_DATABASE_URI)
-print('TESTING = ', TESTING)
-print('FRONTEND_AUTH_CALLBACK = ', FRONTEND_AUTH_CALLBACK)