@jahia/cypress 3.21.2 → 3.23.0

package/ci.startup.sh

@@ -12,6 +12,7 @@ echo " MANIFEST: ${MANIFEST}"
 echo " TESTS_IMAGE: ${TESTS_IMAGE}"
 echo " JAHIA_IMAGE: ${JAHIA_IMAGE}"
 echo " JAHIA_CLUSTER_ENABLED: ${JAHIA_CLUSTER_ENABLED}"
+echo " NEXUS_USERNAME: ${NEXUS_USERNAME:0:3}***${NEXUS_USERNAME:(-6)}"
 
 echo "$(date +'%d %B %Y - %k:%M') [LICENSE] == Check if license exists in env variable (JAHIA_LICENSE) =="
 if [[ -z ${JAHIA_LICENSE} ]]; then

package/dist/utils/SAMHelper.js

@@ -17,6 +17,7 @@ var waitUntilSAMStatusGreen = function (severity, timeout, interval, greenMatchC
     if (interval === void 0) { interval = 500; }
     if (greenMatchCount === void 0) { greenMatchCount = 10; }
     var greenCount = 0;
+    var lastGraphqlResponse = {};
     cy.waitUntil(function () {
         return cy.apollo({
             fetchPolicy: 'no-cache',
@@ -25,15 +26,16 @@ var waitUntilSAMStatusGreen = function (severity, timeout, interval, greenMatchC
                 severity: severity
             }
         }).then(function (result) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e, _f, _g;
             var healthStatus = (_d = (_c = (_b = (_a = result === null || result === void 0 ? void 0 : result.data) === null || _a === void 0 ? void 0 : _a.admin) === null || _b === void 0 ? void 0 : _b.jahia) === null || _c === void 0 ? void 0 : _c.healthCheck) === null || _d === void 0 ? void 0 : _d.status;
+            lastGraphqlResponse = (_g = (_f = (_e = result === null || result === void 0 ? void 0 : result.data) === null || _e === void 0 ? void 0 : _e.admin) === null || _f === void 0 ? void 0 : _f.jahia) === null || _g === void 0 ? void 0 : _g.healthCheck;
             if (healthStatus) {
                 greenCount = healthStatus.health === 'GREEN' ? greenCount + 1 : 0;
                 return greenCount >= greenMatchCount;
             }
         });
     }, {
-        errorMsg: "Timeout waiting for SAM to be green for severity: " + severity,
+        errorMsg: "Timeout waiting for SAM to be green for severity: " + severity + ". Last GraphQL response: " + JSON.stringify(lastGraphqlResponse),
         timeout: timeout,
         verbose: true,
         interval: interval

package/env.provision.sh

@@ -11,6 +11,7 @@ START_TIME=$SECONDS
 
 echo "$(date +'%d %B %Y - %k:%M') == Printing the most important environment variables"
 echo " MANIFEST: ${MANIFEST}"
+echo " NEXUS_USERNAME: ${NEXUS_USERNAME:0:3}***${NEXUS_USERNAME:(-6)}"
 echo " TESTS_IMAGE: ${TESTS_IMAGE}"
 echo " JAHIA_IMAGE: ${JAHIA_IMAGE}"
 echo " JAHIA_CLUSTER_ENABLED: ${JAHIA_CLUSTER_ENABLED}"

package/env.run.sh

@@ -8,6 +8,9 @@ bash $BASEDIR/env.provision.sh
 
 source $BASEDIR/set-env.sh
 
+echo "$(date +'%d %B %Y - %k:%M') == env.run.sh == Printing the most important environment variables"
+echo "$(date +'%d %B %Y - %k:%M') == NEXUS_USERNAME: ${NEXUS_USERNAME:0:3}***${NEXUS_USERNAME:(-6)}"
+
 echo "$(date +'%d %B %Y - %k:%M') == Fetching the list of installed modules =="
 bash -c "unset npm_config_package; npx --yes @jahia/jahia-reporter@latest utils:modules \
   --moduleId=\"${MODULE_ID}\" \

package/fixtures/graphql/sam/healthStatus.graphql

@@ -6,6 +6,13 @@ query($severity: GqlProbeSeverity) {
                     health
                     message
                 }
+                probes(health: YELLOW) {
+                    name
+                    status {
+                        health
+                        message
+                    }
+                }                
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/cypress",
-  "version": "3.21.2",
+  "version": "3.23.0",
   "scripts": {
     "build": "tsc",
     "lint": "eslint src -c .eslintrc.json --ext .ts"

package/src/utils/SAMHelper.ts

@@ -10,6 +10,7 @@
 */
 export const waitUntilSAMStatusGreen = (severity = 'MEDIUM', timeout = 60000, interval = 500, greenMatchCount = 10) : void => {
     let greenCount = 0;
+    let lastGraphqlResponse = {};
     cy.waitUntil(() =>
         cy.apollo({
             fetchPolicy: 'no-cache',
@@ -19,13 +20,14 @@ export const waitUntilSAMStatusGreen = (severity = 'MEDIUM', timeout = 60000, in
             }
         }).then(result => {
             const healthStatus = result?.data?.admin?.jahia?.healthCheck?.status;
+            lastGraphqlResponse = result?.data?.admin?.jahia?.healthCheck;
             if (healthStatus) {
                 greenCount = healthStatus.health === 'GREEN' ? greenCount + 1 : 0;
                 return greenCount >= greenMatchCount;
             }
         }),
     {
-        errorMsg: `Timeout waiting for SAM to be green for severity: ${severity}`,
+        errorMsg: `Timeout waiting for SAM to be green for severity: ${severity}. Last GraphQL response: ${JSON.stringify(lastGraphqlResponse)}`,
         timeout: timeout,
         verbose: true,
         interval: interval