@jahia/cypress 3.28.0 → 3.30.0

package/dist/utils/SAMHelper.d.ts

@@ -12,7 +12,7 @@ export declare const healthCheck: (severity?: string, probeHealthFilter?: string
  * @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
+ * @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 }: {
     expectedHealth: any;

package/dist/utils/SAMHelper.js

@@ -31,10 +31,10 @@ exports.healthCheck = healthCheck;
  * @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
+ * @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 ? 1 : _f;
+    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 statusCount = 0;
     var lastGraphqlResponse = {};
     cy.waitUntil(function () {

package/dist/utils/index.d.ts

@@ -1,10 +1,9 @@
-export * from './ClusterHelper';
-export * from './GraphQLHelper';
-export * from './JahiaPlatformHelper';
 export * from './JCRHelper';
 export * from './PublicationAndWorkflowHelper';
-export * from './SAMHelper';
 export * from './SiteHelper';
-export * from './SSHHelper';
 export * from './UsersHelper';
 export * from './VanityUrlHelper';
+export * from './ClusterHelper';
+export * from './JahiaPlatformHelper';
+export * from './GraphQLHelper';
+export * from './SAMHelper';

package/dist/utils/index.js

@@ -10,13 +10,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 exports.__esModule = true;
-__exportStar(require("./ClusterHelper"), exports);
-__exportStar(require("./GraphQLHelper"), exports);
-__exportStar(require("./JahiaPlatformHelper"), exports);
 __exportStar(require("./JCRHelper"), exports);
 __exportStar(require("./PublicationAndWorkflowHelper"), exports);
-__exportStar(require("./SAMHelper"), exports);
 __exportStar(require("./SiteHelper"), exports);
-__exportStar(require("./SSHHelper"), exports);
 __exportStar(require("./UsersHelper"), exports);
 __exportStar(require("./VanityUrlHelper"), exports);
+__exportStar(require("./ClusterHelper"), exports);
+__exportStar(require("./JahiaPlatformHelper"), exports);
+__exportStar(require("./GraphQLHelper"), exports);
+__exportStar(require("./SAMHelper"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/cypress",
-  "version": "3.28.0",
+  "version": "3.30.0",
   "scripts": {
     "build": "tsc",
     "lint": "eslint src -c .eslintrc.json --ext .ts"
@@ -32,8 +32,7 @@
     "@apollo/client": "^3.4.9",
     "cypress-real-events": "^1.11.0",
     "graphql": "^15.5.0",
-    "graphql-tag": "^2.11.0",
-    "node-ssh": "^13.2.0"
+    "graphql-tag": "^2.11.0"
   },
   "packageManager": "yarn@4.5.0"
 }

package/src/utils/SAMHelper.ts

@@ -28,9 +28,9 @@ export const healthCheck = (severity = 'MEDIUM', probeHealthFilter = 'GREEN'): C
  * @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
+ * @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 = 1}) : void => {
+export const waitUntilSAMStatus = ({expectedHealth, severity = 'MEDIUM', probeHealthFilter = 'GREEN', timeout = 60000, interval = 500, statusMatchCount = 3}) : void => {
     let statusCount = 0;
     let lastGraphqlResponse = {};
     cy.waitUntil(() =>

package/src/utils/index.ts

@@ -1,10 +1,9 @@
-export * from './ClusterHelper';
-export * from './GraphQLHelper';
-export * from './JahiaPlatformHelper';
 export * from './JCRHelper';
 export * from './PublicationAndWorkflowHelper';
-export * from './SAMHelper';
 export * from './SiteHelper';
-export * from './SSHHelper';
 export * from './UsersHelper';
 export * from './VanityUrlHelper';
+export * from './ClusterHelper';
+export * from './JahiaPlatformHelper';
+export * from './GraphQLHelper';
+export * from './SAMHelper';

package/dist/utils/SSHHelper.d.ts

@@ -1,15 +0,0 @@
-import { SSHExecCommandResponse } from 'node-ssh';
-interface connection {
-    hostname: string;
-    port: string;
-    username: string;
-    password: string;
-}
-/**
- * Execute SSH commands on a specific host. Returns a promise that resolves to the command result.
- * Rejects if the commands fail (exit code is not 0).
- * @param commands Array of SSH commands to execute
- * @param connection Connection details
- */
-export declare const sshCommands: (commands: Array<string>, connection: connection) => Promise<SSHExecCommandResponse>;
-export {};

package/dist/utils/SSHHelper.js

@@ -1,44 +0,0 @@
-"use strict";
-exports.__esModule = true;
-exports.sshCommands = void 0;
-var node_ssh_1 = require("node-ssh");
-/**
- * Execute SSH commands on a specific host. Returns a promise that resolves to the command result.
- * Rejects if the commands fail (exit code is not 0).
- * @param commands Array of SSH commands to execute
- * @param connection Connection details
- */
-var sshCommands = function (commands, connection) {
-    return new Promise(function (resolve, reject) {
-        var ssh = new node_ssh_1.NodeSSH();
-        console.info('[SSH] connection to:', connection.hostname, ' (port: ', connection.port, ')');
-        console.info('[SSH] commands:', commands);
-        console.info('[SSH] ', connection);
-        ssh.connect({
-            host: connection.hostname,
-            port: parseInt(connection.port, 10),
-            username: connection.username,
-            password: connection.password
-        })
-            .then(function () {
-            ssh.exec(commands.join(';'), [], { stream: 'both' })
-                .then(function (result) {
-                console.info('[SSH] Successfully executed commands: ', commands);
-                console.info('[SSH] Result: ', result);
-                if (result.code === 0) {
-                    resolve(result); // Resolve to command result
-                }
-                else {
-                    reject(new Error("Commands \"" + commands + "\" failed with exit code " + result.code + " on host " + connection.hostname + ". Stdout:" + result.stdout + ", Stderr: " + result.stderr));
-                }
-            })["catch"](function (reason) {
-                console.error('[SSH] Failed to execute commands: ', commands);
-                reject(reason);
-            });
-        })["catch"](function (reason) {
-            console.error('[SSH] Failed to connect to: ', connection.hostname);
-            reject(reason);
-        });
-    });
-};
-exports.sshCommands = sshCommands;

package/src/utils/SSHHelper.ts

@@ -1,49 +0,0 @@
-import {NodeSSH, SSHExecCommandResponse} from 'node-ssh';
-
-interface connection {
-    hostname: string
-    port: string
-    username: string
-    password: string
-}
-
-/**
- * Execute SSH commands on a specific host. Returns a promise that resolves to the command result.
- * Rejects if the commands fail (exit code is not 0).
- * @param commands Array of SSH commands to execute
- * @param connection Connection details
- */
-export const sshCommands = (commands: Array<string>, connection: connection): Promise<SSHExecCommandResponse> => {
-    return new Promise((resolve, reject) => {
-        const ssh = new NodeSSH();
-        console.info('[SSH] connection to:', connection.hostname, ' (port: ', connection.port, ')');
-        console.info('[SSH] commands:', commands);
-        console.info('[SSH] ', connection);
-        ssh.connect({
-            host: connection.hostname,
-            port: parseInt(connection.port, 10),
-            username: connection.username,
-            password: connection.password
-        })
-            .then(() => {
-                ssh.exec(commands.join(';'), [], {stream: 'both'})
-                    .then(function (result) {
-                        console.info('[SSH] Successfully executed commands: ', commands);
-                        console.info('[SSH] Result: ', result);
-                        if (result.code === 0) {
-                            resolve(result); // Resolve to command result
-                        } else {
-                            reject(new Error(`Commands "${commands}" failed with exit code ${result.code} on host ${connection.hostname}. Stdout:${result.stdout}, Stderr: ${result.stderr}`));
-                        }
-                    })
-                    .catch(reason => {
-                        console.error('[SSH] Failed to execute commands: ', commands);
-                        reject(reason);
-                    });
-            })
-            .catch(reason => {
-                console.error('[SSH] Failed to connect to: ', connection.hostname);
-                reject(reason);
-            });
-    });
-};