@jahia/cypress 3.15.0 → 3.17.0

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/UsersHelper.d.ts

@@ -1,6 +1,8 @@
 export declare const grantRoles: (pathOrId: string, roleNames: Array<string>, principalName: string, principalType: string) => Cypress.Chainable;
+export declare const revokeRoles: (pathOrId: string, roleNames: Array<string>, principalName: string, principalType: string) => Cypress.Chainable;
 export declare const createUser: (userName: string, password: string, properties?: {
     name: string;
     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.revokeRoles = 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({
@@ -14,6 +14,19 @@ var grantRoles = function (pathOrId, roleNames, principalName, principalType) {
     });
 };
 exports.grantRoles = grantRoles;
+var revokeRoles = function (pathOrId, roleNames, principalName, principalType) {
+    cy.log('Revoke role(s) ' + roleNames + ' with principal type ' + principalType + ' to ' + principalName + ' on node ' + pathOrId);
+    return cy.apollo({
+        variables: {
+            pathOrId: pathOrId,
+            roleNames: roleNames,
+            principalName: principalName,
+            principalType: principalType
+        },
+        mutationFile: 'graphql/jcr/mutation/revokeRoles.graphql'
+    });
+};
+exports.revokeRoles = revokeRoles;
 var createUser = function (userName, password, properties) {
     if (properties === void 0) { properties = []; }
     var userProperties = properties.map(function (property) {
@@ -32,3 +45,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/revokeRoles.graphql

@@ -0,0 +1,16 @@
+mutation revokeRoles(
+    $pathOrId: String!
+    $roleNames: [String]!
+    $principalName: String!
+    $principalType: PrincipalType!
+) {
+    jcr {
+        mutateNode(pathOrId: $pathOrId) {
+            revokeRoles(
+                roleNames: $roleNames
+                principalType: $principalType
+                principalName: $principalName
+            )
+        }
+    }
+}

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.15.0",
+  "version": "3.17.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/UsersHelper.ts

@@ -12,6 +12,19 @@ export const grantRoles = (pathOrId: string, roleNames: Array<string>, principal
     });
 };
 
+export const revokeRoles = (pathOrId: string, roleNames: Array<string>, principalName: string, principalType: string): Cypress.Chainable => {
+    cy.log('Revoke role(s) ' + roleNames + ' with principal type ' + principalType + ' to ' + principalName + ' on node ' + pathOrId);
+    return cy.apollo({
+        variables: {
+            pathOrId: pathOrId,
+            roleNames: roleNames,
+            principalName: principalName,
+            principalType: principalType
+        },
+        mutationFile: 'graphql/jcr/mutation/revokeRoles.graphql'
+    });
+};
+
 export const createUser = (userName: string, password: string, properties: { name: string, value: string }[] = []): void => {
     const userProperties = properties.map(property => {
         return 'properties.setProperty("' + property.name + '", "' + property.value + '")';
@@ -28,3 +41,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'
+    });
+};