Merge branch 'master' into 9683-add-arabic

README.md

@@ -57,7 +57,7 @@ Builds brought to you courtesy of GitHub Actions.
 
 ## Copyright
 
-Copyright 2013-2022 Medic Mobile, Inc. <[email protected]>
+Copyright 2013-2025 Medic Mobile, Inc. <[email protected]>
 
 ## License
 

package.json

@@ -53,7 +53,8 @@
     "unit-haproxy-healthcheck": "cd haproxy-healthcheck && make test",
     "unit-cht-deploy": "cd scripts/deploy && npm test",
     "wdio-default-mobile-local": "export VERSION=$(node ./scripts/build/get-version.js) && ./scripts/build/build-service-images.sh && wdio run ./tests/e2e/default-mobile/wdio.conf.js --suite=all",
-    "wdio-visual-local": "export VERSION=$(node ./scripts/build/get-version.js) && ./scripts/build/build-service-images.sh && wdio run ./tests/e2e/visual/wdio.conf.js --suite=all",
+    "wdio-visual-desktop": "export VERSION=$(node ./scripts/build/get-version.js) && ./scripts/build/build-service-images.sh && wdio run ./tests/e2e/visual/wdio.conf.js --suite=desktopTests",
+    "wdio-visual-mobile": "export VERSION=$(node ./scripts/build/get-version.js) && ./scripts/build/build-service-images.sh && wdio run ./tests/e2e/visual/wdio.conf.js --suite=mobileTests",
     "wdio-local": "export VERSION=$(node ./scripts/build/get-version.js) && ./scripts/build/build-service-images.sh && wdio run ./tests/e2e/default/wdio.conf.js",
     "apdex-test": "wdio run ./tests/performance/apdex-score/wdio.conf.js",
     "-- CI SCRIPTS ": "-----------------------------------------------------------------------------------------------",

scripts/docker-helper-4.x/cht-docker-compose.sh

@@ -398,7 +398,7 @@ if [[ -z "$projectName" ]]; then
 
   echo
   # thanks for the pr vs rp!! https://unix.stackexchange.com/a/677805
-  read -rp "Would you like to initialize a new project [y/N]?" yn
+  read -rp "Would you like to initialize a new project [y/N]? " yn
   case $yn in
   [Yy]*)
     while [[ -z "$projectName" ]]; do
@@ -408,10 +408,19 @@ if [[ -z "$projectName" ]]; then
       case $runLatest in
       [nN]*)
         allKnownVersions=$(get_all_known_versions)
+        optionCount=$(wc -l <<< "$allKnownVersions")
         echo
-        echo "Which version to you want to run? (ctrl + c to quit)"
-        select preferredRelease in $allKnownVersions; do
-          break
+        echo "Select a version by entering 1 through ${optionCount} or 'ctrl + c' to quit: "
+        while true; do
+          select preferredRelease in $allKnownVersions; do
+            if [[ "$REPLY" =~ ^[0-9]+$ && "$REPLY" -gt 0 && "$REPLY" -lt $optionCount ]]; then
+              echo
+              echo "Selected version ${preferredRelease}";
+              break 2;
+            else
+              echo "Invalid choice. Enter 1 through ${optionCount} or 'ctrl + c' to quit"
+            fi
+          done
         done
       esac
       echo