@jahia/cypress 3.24.0 → 3.26.0

package/dist/page-object/moonstone/menu.d.ts

@@ -1,9 +1,12 @@
 import { BaseComponent } from '../baseComponent';
+import Chainable = Cypress.Chainable;
 export declare class Menu extends BaseComponent {
     static defaultSelector: string;
+    static overlaySelector: string;
     submenu(item: string, menu: string): Menu;
     shouldHaveItem(item: string): void;
     shouldNotHaveItem(item: string): void;
     select(item: string): Menu;
     selectByRole(item: string): Menu;
+    close(): Chainable<unknown>;
 }

package/dist/page-object/moonstone/menu.js

@@ -44,7 +44,11 @@ var Menu = /** @class */ (function (_super) {
         this.get().find(".moonstone-menuItem[data-sel-role=\"" + item + "\"]").trigger('click');
         return this;
     };
+    Menu.prototype.close = function () {
+        return cy.get(Menu.overlaySelector).click('topRight');
+    };
     Menu.defaultSelector = '.moonstone-menu:not(.moonstone-hidden)';
+    Menu.overlaySelector = '.moonstone-menu_overlay';
     return Menu;
 }(baseComponent_1.BaseComponent));
 exports.Menu = Menu;

package/dist/utils/JCRHelper.d.ts

@@ -14,4 +14,5 @@ export declare const getNodeByPath: (path: string, properties?: string[], langua
 export declare const getNodeAcl: (path: string) => Cypress.Chainable;
 export declare const moveNode: (pathOrId: string, destParentPathOrId: string, destName?: string) => Cypress.Chainable;
 export declare const getNodeTypes: (filter?: {}) => Cypress.Chainable;
+export declare const uploadFile: (fixturePath: string, parentPathOrId: string, name: string, mimeType: string) => Cypress.Chainable;
 export {};

package/dist/utils/JCRHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 exports.__esModule = true;
-exports.getNodeTypes = exports.moveNode = exports.getNodeAcl = exports.getNodeByPath = exports.addNode = exports.deleteNodeProperty = exports.deleteNode = exports.setNodeProperty = void 0;
+exports.uploadFile = exports.getNodeTypes = exports.moveNode = exports.getNodeAcl = exports.getNodeByPath = exports.addNode = exports.deleteNodeProperty = exports.deleteNode = exports.setNodeProperty = void 0;
 var setNodeProperty = function (pathOrId, property, value, language) {
     var mutationFile = 'graphql/jcr/mutation/setProperty.graphql';
     if (value instanceof Array) {
@@ -92,3 +92,20 @@ var getNodeTypes = function (filter) {
     });
 };
 exports.getNodeTypes = getNodeTypes;
+var uploadFile = function (fixturePath, parentPathOrId, name, mimeType) {
+    return cy.fixture(fixturePath, 'binary')
+        .then(function (image) {
+        var blob = Cypress.Blob.binaryStringToBlob(image, mimeType);
+        var file = new File([blob], name, { type: blob.type });
+        return cy.apollo({
+            mutationFile: 'graphql/jcr/mutation/uploadFile.graphql',
+            variables: {
+                parentPathOrId: parentPathOrId,
+                name: name,
+                mimeType: mimeType,
+                file: file
+            }
+        });
+    });
+};
+exports.uploadFile = uploadFile;

package/dist/utils/SAMHelper.d.ts

@@ -1 +1,35 @@
+import Chainable = Cypress.Chainable;
+/**
+ * Simple health check query
+ * @param severity the severity of the health check, default is MEDIUM
+ * @param probeHealthFilter the filter for the health check probes, default is GREEN
+ */
+export declare const healthCheck: (severity?: string, probeHealthFilter?: string) => Chainable<any>;
+/**
+ * Wait until the health check returns the expected health
+ * @param expectedHealth the expected health status
+ * @param severity the severity of the health check, default is MEDIUM
+ * @param probeHealthFilter the filter for the health check probes, default is GREEN
+ * @param timeout the timeout in milliseconds, default is 60000
+ * @param interval the interval in milliseconds, default is 500
+ * @param statusMatchCount the number of consecutive status matches before the waitUntil resolves, default is 1
+ */
+export declare const waitUntilSAMStatus: ({ expectedHealth, severity, probeHealthFilter, timeout, interval, statusMatchCount }: {
+    expectedHealth: any;
+    severity?: string;
+    probeHealthFilter?: string;
+    timeout?: number;
+    interval?: number;
+    statusMatchCount?: number;
+}) => void;
+/**
+ When Jahia is starting or performing provisioning operations
+ it is expected for the SAM probe to alternate beween GREEN, YELLOW and RED statuses.
+
+ The primary use of this method is to wait until a Jahia platform stabilizes after a startup or
+ provisioning operation.
+
+ Instead of waiting only for one occurence of a GREEN status, this function will wait until the a
+ GREEN status was returned a number of consecutive times (greenMatchCount).
+ */
 export declare const waitUntilSAMStatusGreen: (severity?: string, timeout?: number, interval?: number, greenMatchCount?: number) => void;

package/dist/utils/SAMHelper.js

@@ -1,44 +1,75 @@
 "use strict";
 exports.__esModule = true;
-exports.waitUntilSAMStatusGreen = void 0;
-/*
-    When Jahia is starting or performing provisioning operations
-    it is expected for the SAM probe to alternate beween GREEN, YELLOW and RED statuses.
-
-    The primary use of this method is to wait until a Jahia platform stabilizes after a startup or
-    provisioning operation.
-
-    Instead of waiting only for one occurence of a GREEN status, this function will wait until the a
-    GREEN status was returned a number of consecutive times (greenMatchCount).
-*/
-var waitUntilSAMStatusGreen = function (severity, timeout, interval, greenMatchCount) {
+exports.waitUntilSAMStatusGreen = exports.waitUntilSAMStatus = exports.healthCheck = void 0;
+/**
+ * Simple health check query
+ * @param severity the severity of the health check, default is MEDIUM
+ * @param probeHealthFilter the filter for the health check probes, default is GREEN
+ */
+var healthCheck = function (severity, probeHealthFilter) {
     if (severity === void 0) { severity = 'MEDIUM'; }
-    if (timeout === void 0) { timeout = 60000; }
-    if (interval === void 0) { interval = 500; }
-    if (greenMatchCount === void 0) { greenMatchCount = 10; }
-    var greenCount = 0;
+    if (probeHealthFilter === void 0) { probeHealthFilter = 'GREEN'; }
+    return cy
+        .apollo({
+        fetchPolicy: 'no-cache',
+        queryFile: 'graphql/sam/healthStatus.graphql',
+        variables: {
+            severity: severity,
+            probeHealthFilter: probeHealthFilter
+        }
+    })
+        .then(function (response) {
+        var _a, _b, _c;
+        return (_c = (_b = (_a = response === null || response === void 0 ? void 0 : response.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;
+    });
+};
+exports.healthCheck = healthCheck;
+/**
+ * Wait until the health check returns the expected health
+ * @param expectedHealth the expected health status
+ * @param severity the severity of the health check, default is MEDIUM
+ * @param probeHealthFilter the filter for the health check probes, default is GREEN
+ * @param timeout the timeout in milliseconds, default is 60000
+ * @param interval the interval in milliseconds, default is 500
+ * @param statusMatchCount the number of consecutive status matches before the waitUntil resolves, default is 1
+ */
+var waitUntilSAMStatus = function (_a) {
+    var expectedHealth = _a.expectedHealth, _b = _a.severity, severity = _b === void 0 ? 'MEDIUM' : _b, _c = _a.probeHealthFilter, probeHealthFilter = _c === void 0 ? 'GREEN' : _c, _d = _a.timeout, timeout = _d === void 0 ? 60000 : _d, _e = _a.interval, interval = _e === void 0 ? 500 : _e, _f = _a.statusMatchCount, statusMatchCount = _f === void 0 ? 1 : _f;
+    var statusCount = 0;
     var lastGraphqlResponse = {};
     cy.waitUntil(function () {
-        return cy.apollo({
-            fetchPolicy: 'no-cache',
-            queryFile: 'graphql/sam/healthStatus.graphql',
-            variables: {
-                severity: severity
-            }
-        }).then(function (result) {
-            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;
+        return exports.healthCheck(severity, probeHealthFilter).then(function (result) {
+            lastGraphqlResponse = result;
+            var healthStatus = result === null || result === void 0 ? void 0 : result.status;
             if (healthStatus) {
-                greenCount = healthStatus.health === 'GREEN' ? greenCount + 1 : 0;
-                return greenCount >= greenMatchCount;
+                statusCount = healthStatus.health === expectedHealth ? statusCount + 1 : 0;
+                return statusCount >= statusMatchCount;
             }
         });
     }, {
-        errorMsg: "Timeout waiting for SAM to be green for severity: " + severity + ". Last GraphQL response: " + JSON.stringify(lastGraphqlResponse),
+        errorMsg: "Timeout waiting for SAM to be " + expectedHealth + " for severity: " + severity + " and probeHealthFilter: " + probeHealthFilter + ". Last GraphQL response: " + JSON.stringify(lastGraphqlResponse),
         timeout: timeout,
         verbose: true,
         interval: interval
     });
 };
+exports.waitUntilSAMStatus = waitUntilSAMStatus;
+/**
+ When Jahia is starting or performing provisioning operations
+ it is expected for the SAM probe to alternate beween GREEN, YELLOW and RED statuses.
+
+ The primary use of this method is to wait until a Jahia platform stabilizes after a startup or
+ provisioning operation.
+
+ Instead of waiting only for one occurence of a GREEN status, this function will wait until the a
+ GREEN status was returned a number of consecutive times (greenMatchCount).
+ */
+var waitUntilSAMStatusGreen = function (severity, timeout, interval, greenMatchCount) {
+    if (severity === void 0) { severity = 'MEDIUM'; }
+    if (timeout === void 0) { timeout = 60000; }
+    if (interval === void 0) { interval = 500; }
+    if (greenMatchCount === void 0) { greenMatchCount = 10; }
+    // We use YELLOW as the probeHealthFilter because we are not interested in potential GREEN probes in the response
+    exports.waitUntilSAMStatus({ expectedHealth: 'GREEN', severity: severity, probeHealthFilter: 'YELLOW', timeout: timeout, interval: interval, statusMatchCount: greenMatchCount });
+};
 exports.waitUntilSAMStatusGreen = waitUntilSAMStatusGreen;

package/env.run.sh

@@ -10,6 +10,11 @@ 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') == DEBUG: ${DEBUG}"
+
+if [[ "${DEBUG}" == "true" ]]; then
+  touch /tmp/debug
+fi
 
 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 \
@@ -49,10 +54,20 @@ if [[ $? -eq 0 ]]; then
   echo "$(date +'%d %B %Y - %k:%M') == Full execution successful =="
   echo "success" > ./results/test_success
   yarn report:merge; yarn report:html
-  exit 0
 else
   echo "$(date +'%d %B %Y - %k:%M') == One or more failed tests =="
   echo "failure" > ./results/test_failure
   yarn report:merge; yarn report:html
+fi
+
+WAIT_DURATION=0
+while [[ -e /tmp/debug ]]; do
+  echo "Debug file present - $(( ++ WAIT_DURATION ))s - waiting for file removal or expiration of GitHub Actions timeout..."
+  sleep 1;
+done
+
+if [[ -e ./results/test_success ]]; then
+  exit 0
+else
   exit 1
 fi

package/fixtures/graphql/jcr/mutation/uploadFile.graphql

@@ -0,0 +1,11 @@
+mutation uploadFile($name: String!, $parentPathOrId: String!, $mimeType: String!, $file: String!) {
+    jcr {
+        addNode(name: $name, parentPathOrId: $parentPathOrId, primaryNodeType: "jnt:file") {
+            addChild(name: "jcr:content", primaryNodeType: "jnt:resource") {
+                content: mutateProperty(name: "jcr:data") { setValue(type: BINARY, value: $file)}
+                contentType: mutateProperty(name: "jcr:mimeType") { setValue(value: $mimeType)}
+            }
+            uuid
+        }
+    }
+}

package/fixtures/graphql/sam/healthStatus.graphql

@@ -1,4 +1,4 @@
-query($severity: GqlProbeSeverity) {
+query($severity: GqlProbeSeverity, $probeHealthFilter: GqlProbeHealth) {
     admin {
         jahia {
             healthCheck(severity: $severity) {
@@ -6,13 +6,15 @@ query($severity: GqlProbeSeverity) {
                     health
                     message
                 }
-                probes(health: YELLOW) {
+                probes(health: $probeHealthFilter) {
                     name
+                    severity
+                    description
                     status {
                         health
                         message
                     }
-                }                
+                }
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/cypress",
-  "version": "3.24.0",
+  "version": "3.26.0",
   "scripts": {
     "build": "tsc",
     "lint": "eslint src -c .eslintrc.json --ext .ts"
@@ -8,8 +8,8 @@
   "bin": {
     "ci.build": "./ci.build.sh",
     "ci.startup": "./ci.startup.sh",
-    "env.run": "./env.run.sh",
-    "env.debug": "./env.debug.sh"
+    "env.debug": "./env.debug.sh",
+    "env.run": "./env.run.sh"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -33,5 +33,6 @@
     "cypress-real-events": "^1.11.0",
     "graphql": "^15.5.0",
     "graphql-tag": "^2.11.0"
-  }
+  },
+  "packageManager": "yarn@4.5.0"
 }