fix logging integration tests schemas (selenium related)

Author: JFU-NAVA-PBC

apps/integration_tests/log_event_schemas.py

@@ -46,7 +46,7 @@
         "auth_client_id": {"type": "string"},
         "auth_app_id": {"type": "string"},
         "auth_app_name": {"pattern": "TestApp"},
-        "auth_app_data_access_type": {"pattern": "RESEARCH_STUDY"},
+        "auth_app_data_access_type": {"pattern": "THIRTEEN_MONTH"},
         "auth_share_demographic_scopes": {"pattern": "^True$"},
         "auth_require_demographic_scopes": {"pattern": "^True$"},
     },
@@ -94,7 +94,7 @@
         "auth_client_id": {"type": "string"},
         "auth_app_id": {"type": "string"},
         "auth_app_name": {"pattern": "TestApp"},
-        "auth_app_data_access_type": {"pattern": "RESEARCH_STUDY"},
+        "auth_app_data_access_type": {"pattern": "THIRTEEN_MONTH"},
         "auth_require_demographic_scopes": {"pattern": "^True$"},
         "req_qparam_client_id": {"type": "string"},
         "req_qparam_lang": {"type": "string"},
@@ -129,7 +129,7 @@
         "auth_client_id": {"type": "string"},
         "auth_app_id": {"type": "string"},
         "auth_app_name": {"pattern": "TestApp"},
-        "auth_app_data_access_type": {"pattern": "RESEARCH_STUDY"},
+        "auth_app_data_access_type": {"pattern": "THIRTEEN_MONTH"},
         "auth_require_demographic_scopes": {"pattern": "^True$"},
         "path": {"pattern": "/mymedicare/login"},
         "request_method": {"pattern": "GET"},
@@ -158,7 +158,7 @@
         "auth_client_id": {"type": "string"},
         "auth_app_id": {"type": "string"},
         "auth_app_name": {"pattern": "TestApp"},
-        "auth_app_data_access_type": {"pattern": "RESEARCH_STUDY"},
+        "auth_app_data_access_type": {"pattern": "THIRTEEN_MONTH"},
         "auth_crosswalk_action": {"enum": ["R", "C"]},
         "auth_require_demographic_scopes": {"pattern": "^True$"},
         "req_user_id": {"type": "number"},
@@ -195,7 +195,7 @@
         "auth_client_id": {"type": "string"},
         "auth_app_id": {"type": "string"},
         "auth_app_name": {"pattern": "TestApp"},
-        "auth_app_data_access_type": {"pattern": "RESEARCH_STUDY"},
+        "auth_app_data_access_type": {"pattern": "THIRTEEN_MONTH"},
         "auth_crosswalk_action": {"enum": ["R", "C"]},
         "auth_require_demographic_scopes": {"pattern": "^True$"},
         "req_qparam_client_id": {"type": "string"},
@@ -235,13 +235,13 @@
         "auth_client_id": {"type": "string"},
         "auth_app_id": {"type": "string"},
         "auth_app_name": {"pattern": "TestApp"},
-        "auth_app_data_access_type": {"pattern": "RESEARCH_STUDY"},
+        "auth_app_data_access_type": {"pattern": "THIRTEEN_MONTH"},
         "auth_crosswalk_action": {"enum": ["R", "C"]},
         "auth_require_demographic_scopes": {"pattern": "^True$"},
         "req_redirect_uri": {"type": "string"},
         "req_scope": {"type": "string"},
         "req_share_demographic_scopes": {"pattern": "^True$"},
-        "req_allow": {"pattern": "Allow"},
+        "req_allow": {"pattern": "Connect"},
         "req_user_id": {"type": "integer"},
         "req_user_username": {"type": "string"},
         "req_fhir_id": {"type": "string"},

docker-compose.selenium.yml

@@ -50,6 +50,8 @@ services:
   bb2slsx:
     build: .
     command: ./docker-compose/bluebutton_server_start.sh
+    environment:
+      - DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE}
     env_file:
       # local devel specific variables go here!
       - .env

docker-compose/run_selenium_tests_local.sh

@@ -40,6 +40,8 @@ display_usage() {
     echo
     echo "-h     Print this Help."
     echo "-p     Use new permissions screen (defaults to old style screen)."
+    echo "-l     Selenium run in headless mode."
+    echo "-t     Show test case actions on std out."
     echo
 }
 
@@ -77,17 +79,25 @@ export SERVICE_NAME="selenium-tests"
 export TESTS_LIST="./apps/integration_tests/selenium_tests.py ./apps/integration_tests/selenium_spanish_tests.py"
 export DJANGO_SETTINGS_MODULE="hhs_oauth_server.settings.dev"
 export BB2_SERVER_STD2FILE=""
+# selenium headless
+export SELENIUM_HEADLESS=false
+# Show test actions on std out : pytest -s
+PYTEST_SHOW_TRACE_OPT=''
 
 set_slsx
 
 # Parse command line option
-while getopts "hp" option; do
+while getopts "hplt" option; do
    case $option in
       h)
          display_usage
          exit;;
       p)
          export USE_NEW_PERM_SCREEN=true;;
+      l)
+        export SELENIUM_HEADLESS=true;;
+      t)
+        export PYTEST_SHOW_TRACE_OPT='-s';;
      \?)
          display_usage
          exit;;
@@ -139,6 +149,7 @@ fi
 
 echo "DJANGO_SETTINGS_MODULE: " ${DJANGO_SETTINGS_MODULE}
 echo "HOSTNAME_URL: " ${HOSTNAME_URL}
+echo "Selenium headless mode=" ${SELENIUM_HEADLESS}
 
 # Set SYSTEM
 SYSTEM=$(uname -s)
@@ -214,7 +225,7 @@ echo "MSLSX=" ${USE_MSLSX}
 echo "SERVICE NAME=" ${SERVICE_NAME}
 echo "USE_NEW_PERM_SCREEN=" ${USE_NEW_PERM_SCREEN}
 
-docker-compose -f docker-compose.selenium.yml run --service-ports ${SERVICE_NAME} bash -c "pytest ${TESTS_LIST}"
+docker-compose -f docker-compose.selenium.yml run --service-ports ${SERVICE_NAME} bash -c "DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE} SELENIUM_HEADLESS=${SELENIUM_HEADLESS} pytest ${PYTEST_SHOW_TRACE_OPT} ${TESTS_LIST}"
 
 #Stop containers after use
 echo_msg

docker-compose/run_selenium_tests_remote.sh

@@ -27,6 +27,7 @@ display_usage() {
     echo "-h     Print this Help."
     echo "-p     Test for newer permissions screen. Defaults to older screen."
     echo "-l     Selenium run in headless mode."
+    echo "-t     Show test case actions on std out."
     echo
     echo "Examples:"
     echo