@jahia/cypress 3.31.0 → 3.33.0

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

@@ -8,5 +8,7 @@ export declare class Menu extends BaseComponent {
     shouldNotHaveItem(item: string): void;
     select(item: string): Menu;
     selectByRole(item: string): Menu;
+    /** Can be used for choicelist dropdown menu */
+    selectByValue(value: string): Menu;
     close(): Chainable<unknown>;
 }

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

@@ -44,6 +44,12 @@ var Menu = /** @class */ (function (_super) {
         this.get().find(".moonstone-menuItem[data-sel-role=\"" + item + "\"]").trigger('click');
         return this;
     };
+    /** Can be used for choicelist dropdown menu */
+    Menu.prototype.selectByValue = function (value) {
+        this.get().find(".moonstone-menuItem[data-value=\"" + value + "\"]").scrollIntoView().should('be.visible');
+        this.get().find(".moonstone-menuItem[data-value=\"" + value + "\"]").trigger('click');
+        return this;
+    };
     Menu.prototype.close = function () {
         return cy.get(Menu.overlaySelector).click('topRight');
     };

package/dist/utils/JahiaPlatformHelper.d.ts

@@ -1 +1,3 @@
 export declare const getJahiaVersion: () => Cypress.Chainable;
+export declare const getStartedModulesVersion: () => Cypress.Chainable;
+export declare const getStartedModuleVersion: (moduleId: string) => Cypress.Chainable;

package/dist/utils/JahiaPlatformHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 exports.__esModule = true;
-exports.getJahiaVersion = void 0;
+exports.getStartedModuleVersion = exports.getStartedModulesVersion = exports.getJahiaVersion = void 0;
 var getJahiaVersion = function () {
     return cy.apollo({
         fetchPolicy: 'no-cache',
@@ -11,3 +11,20 @@ var getJahiaVersion = function () {
     });
 };
 exports.getJahiaVersion = getJahiaVersion;
+var getStartedModulesVersion = function () {
+    return cy.apollo({
+        fetchPolicy: 'no-cache',
+        queryFile: 'graphql/jcr/query/getStartedModulesVersion.graphql'
+    }).then(function (result) {
+        var _a;
+        return (_a = result === null || result === void 0 ? void 0 : result.data) === null || _a === void 0 ? void 0 : _a.dashboard.modules;
+    });
+};
+exports.getStartedModulesVersion = getStartedModulesVersion;
+var getStartedModuleVersion = function (moduleId) {
+    return exports.getStartedModulesVersion().then(function (modules) {
+        var _a;
+        return (_a = modules.find(function (module) { return module.id === moduleId; })) === null || _a === void 0 ? void 0 : _a.version;
+    });
+};
+exports.getStartedModuleVersion = getStartedModuleVersion;

package/dist/utils/SAMHelper.d.ts

@@ -2,22 +2,25 @@ 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
+ * @param probeHealthFilter return only probes with health status matching or above, default is null
+ * @param probeNamesFilter return and calculate health status only for the probes with the given names, default is null
  */
-export declare const healthCheck: (severity?: string, probeHealthFilter?: string) => Chainable<any>;
+export declare const healthCheck: (severity?: string, probeHealthFilter?: any, probeNamesFilter?: 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 probeHealthFilter return only probes with health status matching or above, default is null
+ * @param probeNamesFilter return and calculate health status only for the probes with the given names, default is null
  * @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 3
  */
-export declare const waitUntilSAMStatus: ({ expectedHealth, severity, probeHealthFilter, timeout, interval, statusMatchCount }: {
+export declare const waitUntilSAMStatus: ({ expectedHealth, severity, probeHealthFilter, probeNamesFilter, timeout, interval, statusMatchCount }: {
     expectedHealth: any;
     severity?: string;
-    probeHealthFilter?: string;
+    probeHealthFilter?: any;
+    probeNamesFilter?: any;
     timeout?: number;
     interval?: number;
     statusMatchCount?: number;

package/dist/utils/SAMHelper.js

@@ -4,18 +4,21 @@ exports.waitUntilSAMStatusGreen = exports.waitUntilSAMStatus = exports.healthChe
 /**
  * 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
+ * @param probeHealthFilter return only probes with health status matching or above, default is null
+ * @param probeNamesFilter return and calculate health status only for the probes with the given names, default is null
  */
-var healthCheck = function (severity, probeHealthFilter) {
+var healthCheck = function (severity, probeHealthFilter, probeNamesFilter) {
     if (severity === void 0) { severity = 'MEDIUM'; }
-    if (probeHealthFilter === void 0) { probeHealthFilter = 'GREEN'; }
+    if (probeHealthFilter === void 0) { probeHealthFilter = null; }
+    if (probeNamesFilter === void 0) { probeNamesFilter = null; }
     return cy
         .apollo({
         fetchPolicy: 'no-cache',
         queryFile: 'graphql/sam/healthStatus.graphql',
         variables: {
             severity: severity,
-            probeHealthFilter: probeHealthFilter
+            probeHealthFilter: probeHealthFilter,
+            probeNamesFilter: probeNamesFilter
         }
     })
         .then(function (response) {
@@ -28,17 +31,18 @@ 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 probeHealthFilter return only probes with health status matching or above, default is null
+ * @param probeNamesFilter return and calculate health status only for the probes with the given names, default is null
  * @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 3
  */
 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 ? 3 : _f;
+    var expectedHealth = _a.expectedHealth, _b = _a.severity, severity = _b === void 0 ? 'MEDIUM' : _b, _c = _a.probeHealthFilter, probeHealthFilter = _c === void 0 ? null : _c, _d = _a.probeNamesFilter, probeNamesFilter = _d === void 0 ? null : _d, _e = _a.timeout, timeout = _e === void 0 ? 60000 : _e, _f = _a.interval, interval = _f === void 0 ? 500 : _f, _g = _a.statusMatchCount, statusMatchCount = _g === void 0 ? 3 : _g;
     var statusCount = 0;
     var lastGraphqlResponse = {};
     cy.waitUntil(function () {
-        return exports.healthCheck(severity, probeHealthFilter).then(function (result) {
+        return exports.healthCheck(severity, probeHealthFilter, probeNamesFilter).then(function (result) {
             lastGraphqlResponse = result;
             var healthStatus = result === null || result === void 0 ? void 0 : result.status;
             if (healthStatus) {

package/fixtures/graphql/jcr/query/getStartedModulesVersion.graphql

@@ -0,0 +1,8 @@
+query getStartedModulesVersion {
+    dashboard {
+        modules {
+            id
+            version
+        }
+    }
+}

package/fixtures/graphql/sam/healthStatus.graphql

@@ -1,7 +1,7 @@
-query($severity: GqlProbeSeverity, $probeHealthFilter: GqlProbeHealth) {
+query($severity: GqlProbeSeverity, $probeHealthFilter: GqlProbeHealth, $probeNamesFilter: [String!]) {
     admin {
         jahia {
-            healthCheck(severity: $severity) {
+            healthCheck(severity: $severity, includes: $probeNamesFilter) {
                 status {
                     health
                     message

package/package.json

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

package/src/page-object/moonstone/menu.ts

@@ -32,6 +32,13 @@ export class Menu extends BaseComponent {
         return this;
     }
 
+    /** Can be used for choicelist dropdown menu */
+    selectByValue(value: string): Menu {
+        this.get().find(`.moonstone-menuItem[data-value="${value}"]`).scrollIntoView().should('be.visible');
+        this.get().find(`.moonstone-menuItem[data-value="${value}"]`).trigger('click');
+        return this;
+    }
+
     close(): Chainable<unknown> {
         return cy.get(Menu.overlaySelector).click('topRight');
     }

package/src/utils/JahiaPlatformHelper.ts

@@ -6,3 +6,18 @@ export const getJahiaVersion = (): Cypress.Chainable => {
         return result?.data?.admin.jahia.version;
     });
 };
+
+export const getStartedModulesVersion = (): Cypress.Chainable => {
+    return cy.apollo({
+        fetchPolicy: 'no-cache',
+        queryFile: 'graphql/jcr/query/getStartedModulesVersion.graphql'
+    }).then(result => {
+        return result?.data?.dashboard.modules;
+    });
+};
+
+export const getStartedModuleVersion = (moduleId: string): Cypress.Chainable => {
+    return getStartedModulesVersion().then(modules => {
+        return modules.find(module => module.id === moduleId)?.version;
+    });
+};

package/src/utils/SAMHelper.ts

@@ -4,16 +4,18 @@ 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
+ * @param probeHealthFilter return only probes with health status matching or above, default is null
+ * @param probeNamesFilter return and calculate health status only for the probes with the given names, default is null
  */
-export const healthCheck = (severity = 'MEDIUM', probeHealthFilter = 'GREEN'): Chainable<any> => {
+export const healthCheck = (severity = 'MEDIUM', probeHealthFilter = null, probeNamesFilter: string[] = null): Chainable<any> => {
     return cy
         .apollo({
             fetchPolicy: 'no-cache',
             queryFile: 'graphql/sam/healthStatus.graphql',
             variables: {
                 severity,
-                probeHealthFilter
+                probeHealthFilter,
+                probeNamesFilter
             }
         })
         .then((response: any) => {
@@ -25,16 +27,17 @@ export const healthCheck = (severity = 'MEDIUM', probeHealthFilter = 'GREEN'): C
  * 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 probeHealthFilter return only probes with health status matching or above, default is null
+ * @param probeNamesFilter return and calculate health status only for the probes with the given names, default is null
  * @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 3
  */
-export const waitUntilSAMStatus = ({expectedHealth, severity = 'MEDIUM', probeHealthFilter = 'GREEN', timeout = 60000, interval = 500, statusMatchCount = 3}) : void => {
+export const waitUntilSAMStatus = ({expectedHealth, severity = 'MEDIUM', probeHealthFilter = null, probeNamesFilter = null, timeout = 60000, interval = 500, statusMatchCount = 3}) : void => {
     let statusCount = 0;
     let lastGraphqlResponse = {};
     cy.waitUntil(() =>
-        healthCheck(severity, probeHealthFilter).then(result => {
+        healthCheck(severity, probeHealthFilter, probeNamesFilter).then(result => {
             lastGraphqlResponse = result;
             const healthStatus = result?.status;
             if (healthStatus) {