@jahia/cypress 3.14.9 → 3.16.0

package/ci.build.sh

@@ -23,7 +23,7 @@ if [ -d ./jahia-module ]; then
   cd jahia-module
   if [ -e "pom.xml" ]; then
     mvn clean install
-    cp target/*-SNAPSHOT.jar ../artifacts/
+    find . -type f -name "*-SNAPSHOT.jar" -exec cp {} ../artifacts/ \;
   elif [ -e "package.json" ]; then
     rm ./*-SNAPSHOT.tgz
     yarn set version stable && yarn install && yarn build && yarn jahia-pack

package/dist/utils/JCRHelper.d.ts

@@ -7,6 +7,7 @@ export declare const addNode: (variables: {
     name: string;
     properties?: any[];
     children?: any[];
+    mixins?: any[];
 }) => Cypress.Chainable;
 export declare const getNodeByPath: (path: string, properties?: string[], language?: string, childrenTypes?: string[], workspace?: 'EDIT' | 'LIVE') => Cypress.Chainable;
 export declare const getNodeAcl: (path: string) => Cypress.Chainable;

package/dist/utils/PublicationAndWorkflowHelper.d.ts

@@ -1,4 +1,6 @@
 export declare const publishAndWaitJobEnding: (path: string, languages?: string[]) => void;
+export declare const unpublishNode: (path: string, languages: string) => void;
 export declare const startWorkflow: (pathOrId: string, definition: string, language: string) => Cypress.Chainable;
 export declare const validateAllWorkflows: () => void;
+export declare const abortAllWorkflows: () => void;
 export declare const waitAllJobsFinished: (errorMessage?: string, timeout?: number) => void;

package/dist/utils/PublicationAndWorkflowHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 exports.__esModule = true;
-exports.waitAllJobsFinished = exports.validateAllWorkflows = exports.startWorkflow = exports.publishAndWaitJobEnding = void 0;
+exports.waitAllJobsFinished = exports.abortAllWorkflows = exports.validateAllWorkflows = exports.startWorkflow = exports.unpublishNode = exports.publishAndWaitJobEnding = void 0;
 var publishAndWaitJobEnding = function (path, languages) {
     if (languages === void 0) { languages = ['en']; }
     cy.apollo({
@@ -15,6 +15,16 @@ var publishAndWaitJobEnding = function (path, languages) {
     exports.waitAllJobsFinished('Publication timeout for node: ' + path, 60000);
 };
 exports.publishAndWaitJobEnding = publishAndWaitJobEnding;
+var unpublishNode = function (path, languages) {
+    cy.apollo({
+        variables: {
+            pathOrId: path,
+            languages: languages
+        },
+        mutationFile: 'graphql/jcr/mutation/unpublishNode.graphql'
+    });
+};
+exports.unpublishNode = unpublishNode;
 var startWorkflow = function (pathOrId, definition, language) {
     return cy.apollo({
         variables: {
@@ -31,6 +41,10 @@ var validateAllWorkflows = function () {
     exports.waitAllJobsFinished('All workflows validated but some jobs are still running after a minute', 60000);
 };
 exports.validateAllWorkflows = validateAllWorkflows;
+var abortAllWorkflows = function () {
+    cy.executeGroovy('groovy/admin/abortWorkflows.groovy');
+};
+exports.abortAllWorkflows = abortAllWorkflows;
 var waitAllJobsFinished = function (errorMessage, timeout) {
     if (timeout === void 0) { timeout = 60000; }
     cy.waitUntil(function () {

package/dist/utils/UsersHelper.d.ts

@@ -4,3 +4,4 @@ export declare const createUser: (userName: string, password: string, properties
     value: string;
 }[]) => void;
 export declare const deleteUser: (userName: string) => void;
+export declare const addUserToGroup: (userName: string, groupName: string, siteKey?: string) => void;

package/dist/utils/UsersHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 exports.__esModule = true;
-exports.deleteUser = exports.createUser = exports.grantRoles = void 0;
+exports.addUserToGroup = exports.deleteUser = exports.createUser = exports.grantRoles = void 0;
 var grantRoles = function (pathOrId, roleNames, principalName, principalType) {
     cy.log('Grant role(s) ' + roleNames + ' with principal type ' + principalType + ' to ' + principalName + ' on node ' + pathOrId);
     return cy.apollo({
@@ -32,3 +32,11 @@ var deleteUser = function (userName) {
     });
 };
 exports.deleteUser = deleteUser;
+var addUserToGroup = function (userName, groupName, siteKey) {
+    cy.executeGroovy('groovy/admin/addUserToGroup.groovy', {
+        USER_NAME: userName,
+        GROUP_NAME: groupName,
+        SITE_KEY: siteKey ? "\"" + siteKey + "\"" : 'null'
+    });
+};
+exports.addUserToGroup = addUserToGroup;

package/fixtures/graphql/jcr/mutation/addNode.graphql

@@ -1,10 +1,11 @@
-mutation addNode($parentPathOrId: String!, $name: String!, $primaryNodeType: String!, $children: [InputJCRNode] = [], $properties: [InputJCRProperty]) {
+mutation addNode($parentPathOrId: String!, $name: String!, $primaryNodeType: String!, $children: [InputJCRNode] = [], $properties: [InputJCRProperty], $mixins: [String] = []) {
     jcr(workspace: EDIT) {
         addNode(
             parentPathOrId: $parentPathOrId,
             name: $name,
             primaryNodeType: $primaryNodeType,
             properties: $properties,
+            mixins: $mixins
         ) {
             addChildrenBatch(nodes: $children){
                 uuid

package/fixtures/graphql/jcr/mutation/unpublishNode.graphql

@@ -0,0 +1,7 @@
+mutation unpublishNode($pathOrId: String!, $languages: [String]!) {
+    jcr(workspace: EDIT) {
+        mutateNode(pathOrId: $pathOrId) {
+            unpublish(languages: $languages)
+        }
+    }
+}

package/fixtures/groovy/admin/abortWorkflows.groovy

@@ -0,0 +1,12 @@
+import org.jahia.services.usermanager.JahiaUser
+import org.jahia.services.usermanager.JahiaUserManagerService
+import org.jahia.services.workflow.Workflow
+import org.jahia.services.workflow.WorkflowService
+import org.jahia.services.workflow.WorkflowTask
+
+final JahiaUser user = JahiaUserManagerService.getInstance().lookupRootUser().getJahiaUser();
+List<WorkflowTask> tasks = WorkflowService.getInstance().getTasksForUser(user, Locale.ENGLISH);
+for (WorkflowTask task : tasks) {
+    Workflow w = WorkflowService.getInstance().getWorkflow(task.getProvider(), task.getProcessId(), Locale.ENGLISH);
+    WorkflowService.getInstance().abortProcess(w.getId(), w.getProvider());
+}

package/fixtures/groovy/admin/addUserToGroup.groovy

@@ -0,0 +1,17 @@
+import org.jahia.services.content.JCRTemplate
+import org.jahia.services.usermanager.JahiaGroupManagerService
+import org.jahia.services.usermanager.JahiaUserManagerService
+import org.jahia.services.content.decorator.JCRGroupNode
+import org.jahia.services.content.decorator.JCRUserNode
+
+log.info("Add user USER_NAME to group GROUP_NAME")
+JCRTemplate.getInstance().doExecuteWithSystemSession(session -> {
+    JahiaUserManagerService userManagerService = JahiaUserManagerService.getInstance()
+    JahiaGroupManagerService groupManagerService = JahiaGroupManagerService.getInstance()
+    JCRGroupNode groupNode = groupManagerService.lookupGroup(SITE_KEY, "GROUP_NAME", session)
+    JCRUserNode userNode = userManagerService.lookupUser("USER_NAME")
+    if (!groupNode.isMember(userNode)) {
+        groupNode.addMember(userNode)
+    }
+    session.save()
+})

package/package.json

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

package/src/utils/JCRHelper.ts

@@ -36,7 +36,7 @@ export const deleteNodeProperty = (pathOrId: string, property: string, language:
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const addNode = (variables: { parentPathOrId: string, primaryNodeType: string, name: string, properties?: any[], children?: any[] }): Cypress.Chainable => {
+export const addNode = (variables: { parentPathOrId: string, primaryNodeType: string, name: string, properties?: any[], children?: any[], mixins?: any[] }): Cypress.Chainable => {
     return cy.apollo({
         variables: variables,
         mutationFile: 'graphql/jcr/mutation/addNode.graphql'

package/src/utils/PublicationAndWorkflowHelper.ts

@@ -12,6 +12,16 @@ export const publishAndWaitJobEnding = (path: string, languages: string[] = ['en
     waitAllJobsFinished('Publication timeout for node: ' + path, 60000);
 };
 
+export const unpublishNode = (path: string, languages: string): void => {
+    cy.apollo({
+        variables: {
+            pathOrId: path,
+            languages: languages
+        },
+        mutationFile: 'graphql/jcr/mutation/unpublishNode.graphql'
+    });
+};
+
 export const startWorkflow = (pathOrId: string, definition: string, language: string): Cypress.Chainable => {
     return cy.apollo({
         variables: {
@@ -28,6 +38,10 @@ export const validateAllWorkflows = (): void => {
     waitAllJobsFinished('All workflows validated but some jobs are still running after a minute', 60000);
 };
 
+export const abortAllWorkflows = (): void => {
+    cy.executeGroovy('groovy/admin/abortWorkflows.groovy');
+};
+
 export const waitAllJobsFinished = (errorMessage?: string, timeout = 60000): void => {
     cy.waitUntil(
         () =>

package/src/utils/UsersHelper.ts

@@ -28,3 +28,11 @@ export const deleteUser = (userName: string): void => {
         USER_NAME: userName
     });
 };
+
+export const addUserToGroup = (userName: string, groupName: string, siteKey?: string): void => {
+    cy.executeGroovy('groovy/admin/addUserToGroup.groovy', {
+        USER_NAME: userName,
+        GROUP_NAME: groupName,
+        SITE_KEY: siteKey ? `"${siteKey}"` : 'null'
+    });
+};