BB2-2379 Update Selenium tests for new perm screens (#1130)

* Update remote type tests for new perm screens

* Update for cases for new perm screen

* Update to force migrations true

Author: dtisza1

apps/integration_tests/selenium_cases.py

@@ -4,6 +4,7 @@
 
 
 HOSTNAME_URL = os.environ['HOSTNAME_URL']
+USE_NEW_PERM_SCREEN = os.environ['USE_NEW_PERM_SCREEN']
 PROD_URL = 'https://api.bluebutton.cms.gov'
 USER_ACTIVATION_PATH_FMT = "{}/v1/accounts/activation-verify/{}"
 
@@ -126,7 +127,13 @@ class Action(Enum):
 # Demographic info access grant form
 BTN_ID_GRANT_DEMO_ACCESS = "approve"
 BTN_ID_DENY_DEMO_ACCESS = "deny"
-BTN_ID_RADIO_NOT_SHARE = "label:nth-child(5)"
+if USE_NEW_PERM_SCREEN == "true":
+    # Below works for new auth screen
+    BTN_ID_RADIO_NOT_SHARE = "radio_1"
+else:
+    # Below works for old auth screen
+    BTN_ID_RADIO_NOT_SHARE = "label:nth-child(5)"
+
 
 # API versions
 API_V2 = "v2"
@@ -170,9 +177,17 @@ class Action(Enum):
 CLICK_RADIO_NOT_SHARE = {
     "display": "Click 'Share healthcare data, but not your personal info' on DEMO info grant form",
     "action": Action.FIND_CLICK,
+    # Below works for old auth screen
     "params": [20, By.CSS_SELECTOR, BTN_ID_RADIO_NOT_SHARE]
 }
 
+CLICK_RADIO_NOT_SHARE_NEW_PERM_SCREEN = {
+    "display": "Click 'Share healthcare data, but not your personal info' on DEMO info grant form (NEW PERM SCREEN)",
+    "action": Action.FIND_CLICK,
+    # Below works for new auth screen
+    "params": [20, By.ID, BTN_ID_RADIO_NOT_SHARE]
+}
+
 CLICK_AGREE_ACCESS = {
     "display": "Click 'Agree' on DEMO info grant form",
     "action": Action.FIND_CLICK,
@@ -475,6 +490,13 @@ class Action(Enum):
         CLICK_RADIO_NOT_SHARE,
         CLICK_AGREE_ACCESS,
         {"sequence": SEQ_QUERY_FHIR_RESOURCES_NO_DEMO}
+    ],
+    "auth_grant_w_no_demo_new_perm_screen": [
+        {"sequence": SEQ_AUTHORIZE_START},
+        CALL_LOGIN,
+        CLICK_RADIO_NOT_SHARE_NEW_PERM_SCREEN,
+        CLICK_AGREE_ACCESS,
+        {"sequence": SEQ_QUERY_FHIR_RESOURCES_NO_DEMO}
     ]
 }
 

apps/integration_tests/selenium_tests.py

@@ -1,4 +1,4 @@
-
+import os
 from .selenium_generic import SeleniumGenericTests
 from .selenium_cases import (
     API_V2,
@@ -7,6 +7,9 @@
 )
 
 
+USE_NEW_PERM_SCREEN = os.environ['USE_NEW_PERM_SCREEN']
+
+
 class TestBlueButtonAPI(SeleniumGenericTests):
     '''
     Test authorization and fhir flow through the built in testclient by
@@ -66,16 +69,23 @@ def test_auth_deny_fhir_calls_v2(self):
 
     def test_auth_grant_w_no_demo_v1(self):
         step = [0]
-        test_name = "auth_grant_w_no_demo"
+        if USE_NEW_PERM_SCREEN == "true":
+            test_name = "auth_grant_w_no_demo_new_perm_screen"
+        else:
+            test_name = "auth_grant_w_no_demo"
         api_ver = API_V1
+        self._print_testcase_banner(self.driver.current_url, api_ver, step[0], self.use_mslsx, True)
         self._print_testcase_banner(test_name, api_ver, step[0], self.use_mslsx, True)
         self._play(TESTS[test_name], step, api_ver=api_ver)
         self._testclient_home()
         self._print_testcase_banner(test_name, api_ver, step[0], self.use_mslsx, False)
 
     def test_auth_grant_w_no_demo_v2(self):
         step = [0]
-        test_name = "auth_grant_w_no_demo"
+        if USE_NEW_PERM_SCREEN == "true":
+            test_name = "auth_grant_w_no_demo_new_perm_screen"
+        else:
+            test_name = "auth_grant_w_no_demo"
         api_ver = API_V2
         self._print_testcase_banner(test_name, api_ver, step[0], self.use_mslsx, True)
         self._play(TESTS[test_name], step, api_ver=api_ver)

docker-compose.selenium.yml

@@ -64,11 +64,11 @@ services:
     build: .
     command: ./docker-compose/bluebutton_server_start.sh
     env_file:
+      # local devel specific variables go here!
+      - .env
       - docker-compose/web-env-vars.env
       - docker-compose/slsx-env-vars.env
       - docker-compose/selenium-env-vars.env
-      # local devel specific variables go here!
-      - .env
     volumes:
       - .:/code
     ports:

docker-compose/run_selenium_tests_remote.sh

@@ -20,20 +20,21 @@ display_usage() {
     echo "Usage:"
     echo "------------------"
     echo
-    echo "Syntax: run_selenium_tests_remote.sh [-h|d] [SBX|PROD|TEST|<bb2 server url>]"
+    echo "Syntax: run_selenium_tests_remote.sh [-h|d|p] [SBX|PROD|TEST|<bb2 server url>]"
     echo
     echo "Options:"
     echo
     echo "-h     Print this Help."
     echo "-d     Run tests in selenium debug mode (vnc view web UI interaction at http://localhost:5900)."
+    echo "-p     Test for newer permissions screen. Defaults to older screen."
     echo
     echo "Examples:"
     echo
     echo "run_selenium_tests_remote.sh  https://sandbox.bluebutton.cms.gov/ (or SBX)"
     echo
-    echo "run_selenium_tests_remote.sh  https://api.bluebutton.cms.gov/ (or PROD)"
+    echo "run_selenium_tests_remote.sh -d  https://api.bluebutton.cms.gov/ (or PROD)"
     echo
-    echo "run_selenium_tests_remote.sh  https://test.bluebutton.cms.gov/ (or TEST)"
+    echo "run_selenium_tests_remote.sh -d -p  https://test.bluebutton.cms.gov/ (or TEST)"
     echo
     echo "<bb2 server url> default to SBX (https://sandbox.bluebutton.cms.gov/)"
     echo
@@ -49,29 +50,33 @@ echo_msg
 set -e -u -o pipefail
 
 export USE_DEBUG=false
+export USE_NEW_PERM_SCREEN=false
 export SERVICE_NAME="selenium-tests-remote"
 export TESTS_LIST="./apps/integration_tests/selenium_tests.py"
 # BB2 service end point default (SBX)
 export HOSTNAME_URL="https://sandbox.bluebutton.cms.gov/"
-export USE_DEBUG=false
 
-while getopts "hd" option; do
+
+while getopts "hdp" option; do
    case $option in
       h)
         display_usage;
         exit;;
       d)
-        export USE_DEBUG=true;
-        shift;break;;
+        export USE_DEBUG=true;;
+      p)
+        export USE_NEW_PERM_SCREEN=true;;
      \?)
         display_usage;
         exit;;
    esac
 done
 
-if [[ -n ${1-''} ]]
+eval last_arg=\$$#
+
+if [[ -n ${last_arg} ]]
 then
-    case "$1" in
+    case "${last_arg}" in
         SBX)
             export HOSTNAME_URL="https://sandbox.bluebutton.cms.gov/"
             ;;
@@ -82,11 +87,11 @@ then
             export HOSTNAME_URL="https://test.bluebutton.cms.gov/"
             ;;
         *)
-            if [[ $1 == 'http*' ]]
+            if [[ ${last_arg} == 'http*' ]]
             then
-                export HOSTNAME_URL=$1
+                export HOSTNAME_URL=${last_arg}
             else
-                echo "Invalid argument: " $1
+                echo "Invalid argument: " ${last_arg}
                 display_usage
                 exit 1
             fi
@@ -98,9 +103,11 @@ fi
 SYSTEM=$(uname -s)
 
 echo "USE_DEBUG=" ${USE_DEBUG}
+echo "USE_NEW_PERM_SCREEN=" ${USE_NEW_PERM_SCREEN}
 echo "BB2 Server URL=" ${HOSTNAME_URL}
 
 export USE_DEBUG
+export USE_NEW_PERM_SCREEN
 export USE_MSLSX=false
 
 # stop all before run selenium remote tests

docker-compose/selenium-env-vars.env

@@ -2,4 +2,8 @@
 HOSTNAME_URL=${HOSTNAME_URL}
 USE_MSLSX=${USE_MSLSX}
 USE_DEBUG=${USE_DEBUG}
-DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE}
+USE_NEW_PERM_SCREEN=${USE_NEW_PERM_SCREEN}
+DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE}
+
+# Force to true in case false in .env
+DB_MIGRATIONS=true