@jahia/cypress 6.4.5 → 7.0.0

package/ci.startup.sh

@@ -32,7 +32,7 @@ if [[ "${JAHIA_CLUSTER_ENABLED}" == "true" ||  ${JAHIA_CLUSTER_ENABLED} == true
 fi
 
 echo "$(date +'%d %B %Y - %k:%M') == Starting environment =="
-docker-compose ${CLUSTER_PROFILE} up -d --renew-anon-volumes
+docker-compose ${CLUSTER_PROFILE} up -d --renew-anon-volumes $(docker-compose config --services | grep -v "cypress")
 if [[ "$1" != "notests" ]]; then
     docker ps -a
     docker stats --no-stream

package/dist/utils/JCRHelper.d.ts

@@ -17,4 +17,6 @@ export declare const moveNode: (pathOrId: string, destParentPathOrId: string, de
 export declare const getNodeTypes: (filter?: {}) => Cypress.Chainable;
 export declare const markForDeletion: (pathOrId: string) => Cypress.Chainable;
 export declare const uploadFile: (fixturePath: string, parentPathOrId: string, name: string, mimeType: string) => Cypress.Chainable;
+export declare const lockNode: (pathOrId: string) => Cypress.Chainable;
+export declare const unlockNode: (pathOrId: string) => Cypress.Chainable;
 export {};

package/dist/utils/JCRHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 exports.__esModule = true;
-exports.uploadFile = exports.markForDeletion = exports.getNodeTypes = exports.moveNode = exports.getNodeAcl = exports.getNodeByPath = exports.addMixins = exports.addNode = exports.deleteNodeProperty = exports.deleteNode = exports.setNodeProperty = void 0;
+exports.unlockNode = exports.lockNode = exports.uploadFile = exports.markForDeletion = exports.getNodeTypes = exports.moveNode = exports.getNodeAcl = exports.getNodeByPath = exports.addMixins = 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) {
@@ -125,3 +125,21 @@ var uploadFile = function (fixturePath, parentPathOrId, name, mimeType) {
     });
 };
 exports.uploadFile = uploadFile;
+var lockNode = function (pathOrId) {
+    return cy.apollo({
+        mutationFile: 'graphql/jcr/mutation/lockNode.graphql',
+        variables: {
+            pathOrId: pathOrId
+        }
+    });
+};
+exports.lockNode = lockNode;
+var unlockNode = function (pathOrId) {
+    return cy.apollo({
+        mutationFile: 'graphql/jcr/mutation/unlockNode.graphql',
+        variables: {
+            pathOrId: pathOrId
+        }
+    });
+};
+exports.unlockNode = unlockNode;

package/env.Dockerfile

@@ -1,10 +1,11 @@
-FROM cypress/browsers:node-22.13.1-chrome-132.0.6834.159-1-ff-134.0.2-edge-132.0.2957.127-1
+FROM cypress/browsers:node-22.21.0-chrome-141.0.7390.107-1-ff-144.0-edge-141.0.3537.92-1
 
 ARG MAVEN_VER="3.8.1"
 ARG MAVEN_BASE_URL="https://archive.apache.org/dist/maven/maven-3"
 ARG YARN_VERSION="1.22.19"
 
-RUN apt-get update && apt-get install -y jq curl ; \
+RUN apt-get update
+RUN apt-get install -y jq curl ; \
     npm -g install corepack ; \
     corepack enable
 

package/fixtures/graphql/jcr/mutation/lockNode.graphql

@@ -0,0 +1,7 @@
+mutation lockNode($pathOrId: String!){
+  jcr{
+    mutateNode(pathOrId: $pathOrId){
+      lock
+    }
+  }
+}

package/fixtures/graphql/jcr/mutation/unlockNode.graphql

@@ -0,0 +1,7 @@
+mutation unlockNode($pathOrId: String!){
+  jcr{
+    mutateNode(pathOrId: $pathOrId){
+      unlock
+    }
+  }
+}

package/fixtures/groovy/admin/deleteUser.groovy

@@ -10,8 +10,13 @@ JCRTemplate.getInstance().doExecuteWithSystemSession(new JCRCallback() {
         log.info("Delete user : USER_NAME" );
 
         JahiaUserManagerService userManagerService = JahiaUserManagerService.getInstance();
-        userManagerService.deleteUser(userManagerService.getUserPath("USER_NAME"), session);
-        session.save();
+        def user = userManagerService.getUserPath("USER_NAME");
+        if (user) {
+            userManagerService.deleteUser(user, session);
+            session.save();
+        } else {
+            log.warn("User USER_NAME cannot be deleted. User not found");
+        }
         return null;
     }
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/cypress",
-  "version": "6.4.5",
+  "version": "7.0.0",
   "scripts": {
     "build": "tsc",
     "lint": "eslint src -c .eslintrc.json --ext .ts --max-warnings=0"

package/src/utils/JCRHelper.ts

@@ -131,3 +131,21 @@ export const uploadFile = (fixturePath: string, parentPathOrId: string, name: st
             });
         });
 };
+
+export const lockNode = (pathOrId: string): Cypress.Chainable => {
+    return cy.apollo({
+        mutationFile: 'graphql/jcr/mutation/lockNode.graphql',
+        variables: {
+            pathOrId: pathOrId
+        }
+    });
+};
+
+export const unlockNode = (pathOrId: string): Cypress.Chainable => {
+    return cy.apollo({
+        mutationFile: 'graphql/jcr/mutation/unlockNode.graphql',
+        variables: {
+            pathOrId: pathOrId
+        }
+    });
+};