Merge branch 'master' into bw/BB2-4166

Author: bwang-icf

apps/integration_tests/selenium_cases.py

@@ -157,9 +157,6 @@ class Action(Enum):
 EN_US = "en_us"
 ES_ES = "es_es"
 
-# API versions
-API_V2 = "v2"
-
 # v2 SMART APP scope constants
 X_PATH_FOR_USER_SCOPES = "//*[@id='main-content']/div/div/div/pre"
 COVERAGE_SCOPE = "patient/Coverage.rs"

apps/integration_tests/selenium_spanish_tests.py

@@ -1,8 +1,6 @@
 from .selenium_generic import SeleniumGenericTests
-from .selenium_cases import (
-    API_V2,
-    SPANISH_TESTS
-)
+from .selenium_cases import SPANISH_TESTS
+from apps.constants import Versions
 
 USE_NEW_PERM_SCREEN = "true"
 
@@ -20,7 +18,7 @@ class TestPermissionScreenSpanish(SeleniumGenericTests):
     def test_toggle_language_and_date_format(self):
         step = [0]
         test_name = "toggle_language"
-        api_ver = API_V2
+        api_ver = Versions.V2
         self._print_testcase_banner(test_name, api_ver, step[0], self.use_mslsx, True)
         if not self.use_mslsx:
             self._play(SPANISH_TESTS[test_name], step, api_ver=api_ver)
@@ -37,7 +35,7 @@ def test_toggle_language_and_date_format(self):
     def test_authorize_lang_param(self):
         step = [0]
         test_name = "authorize_lang_param"
-        api_ver = API_V2
+        api_ver = Versions.V2
         self._print_testcase_banner(test_name, api_ver, step[0], self.use_mslsx, True)
         if not self.use_mslsx:
             self._play(SPANISH_TESTS[test_name], step, api_ver=api_ver)
@@ -54,7 +52,7 @@ def test_authorize_lang_param(self):
     def test_authorize_lang_spanish_button(self):
         step = [0]
         test_name = "authorize_lang_spanish_button"
-        api_ver = API_V2
+        api_ver = Versions.V2
         self._print_testcase_banner(test_name, api_ver, step[0], self.use_mslsx, True)
         if USE_NEW_PERM_SCREEN == "true":
             # the validation of expire date etc. only applicable to new perm screen

apps/integration_tests/selenium_tests.py

@@ -1,9 +1,7 @@
 import os
 from .selenium_generic import SeleniumGenericTests
-from .selenium_cases import (
-    API_V2,
-    TESTS,
-)
+from .selenium_cases import TESTS
+from apps.constants import Versions
 
 
 USE_NEW_PERM_SCREEN = os.environ['USE_NEW_PERM_SCREEN']
@@ -17,7 +15,7 @@ class TestBlueButtonAPI(SeleniumGenericTests):
     def test_auth_grant_pkce_fhir_calls_v2(self):
         step = [0]
         test_name = "auth_grant_pkce_fhir_calls"
-        api_ver = API_V2
+        api_ver = Versions.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)
         self._testclient_home()
@@ -26,7 +24,7 @@ def test_auth_grant_pkce_fhir_calls_v2(self):
     def test_auth_deny_fhir_calls_v2(self):
         step = [0]
         test_name = "auth_deny_fhir_calls"
-        api_ver = API_V2
+        api_ver = Versions.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)
         self._print_testcase_banner(test_name, api_ver, step[0], self.use_mslsx, False)
@@ -37,7 +35,7 @@ def test_auth_grant_w_no_demo_v2(self):
             test_name = "auth_grant_w_no_demo_new_perm_screen"
         else:
             test_name = "auth_grant_w_no_demo"
-        api_ver = API_V2
+        api_ver = Versions.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)
         self._testclient_home()
@@ -51,7 +49,7 @@ def test_auth_grant_w_no_demo_v2(self):
     def test_authorize_lang_english_button(self):
         step = [0]
         test_name = "authorize_lang_english_button"
-        api_ver = API_V2
+        api_ver = Versions.V2
         self._print_testcase_banner(test_name, api_ver, step[0], self.use_mslsx, True)
         if USE_NEW_PERM_SCREEN == "true":
             # the validation of expire date etc. only applicable to new perm screen
@@ -68,7 +66,7 @@ def test_authorize_lang_english_button(self):
     def test_v2_authorization_and_scopes(self):
         step = [0]
         test_name = "authorize_get_v2_scopes"
-        api_ver = API_V2
+        api_ver = Versions.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/run_selenium_tests_local.sh

@@ -87,7 +87,7 @@ PYTEST_SHOW_TRACE_OPT=''
 # set_slsx
 
 # Parse command line option
-while getopts "hpgt" option; do
+while getopts "hgt" option; do
    case $option in
       h)
          display_usage

docker-compose/run_selenium_tests_remote.sh

@@ -20,7 +20,7 @@ display_usage() {
     echo "Usage:"
     echo "------------------"
     echo
-    echo "Syntax: run_selenium_tests_remote.sh [-h|d|p] [SBX|PROD|TEST|<bb2 server url>]"
+    echo "Syntax: run_selenium_tests_remote.sh [-h|g|t|l] [SBX|PROD|TEST|<bb2 server url>]"
     echo
     echo "Options:"
     echo
@@ -62,7 +62,7 @@ export SELENIUM_GRID=false
 # Show test actions on std out : pytest -s
 PYTEST_SHOW_TRACE_OPT=''
 
-while getopts "hpgt" option; do
+while getopts "hglt" option; do
    case $option in
       h)
         display_usage;