@jahia/cypress 3.16.0 → 3.17.1

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

@@ -26,7 +26,7 @@ var Dropdown = /** @class */ (function (_super) {
     }
     Dropdown.prototype.select = function (item) {
         this.get().click();
-        utils_1.getComponent(menu_1.Menu).select(item);
+        utils_1.getComponent(menu_1.Menu, null, function ($el) { return expect($el).to.be.visible; }).select(item);
         return this;
     };
     Dropdown.defaultSelector = '.moonstone-dropdown_container';

package/dist/utils/JCRHelper.js

@@ -53,8 +53,8 @@ var getNodeByPath = function (path, properties, language, childrenTypes, workspa
             path: path,
             properties: properties,
             language: language,
-            childrenTypes: childrenTypes,
-            workspace: workspace
+            childrenTypes: childrenTypes || [],
+            workspace: workspace || 'EDIT'
         },
         queryFile: 'graphql/jcr/query/getNodeByPath.graphql'
     });

package/dist/utils/UsersHelper.d.ts

@@ -1,4 +1,5 @@
 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;

package/dist/utils/UsersHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 exports.__esModule = true;
-exports.addUserToGroup = 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) {

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/package.json

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

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

@@ -7,7 +7,7 @@ export class Dropdown extends BaseComponent {
 
     select(item: string): Dropdown {
         this.get().click();
-        getComponent(Menu).select(item);
+        getComponent(Menu, null, $el => expect($el).to.be.visible).select(item);
         return this;
     }
 }

package/src/utils/JCRHelper.ts

@@ -49,8 +49,8 @@ export const getNodeByPath = (path: string, properties?: string[], language?: st
             path: path,
             properties: properties,
             language: language,
-            childrenTypes: childrenTypes,
-            workspace: workspace
+            childrenTypes: childrenTypes || [],
+            workspace: workspace || 'EDIT'
         },
         queryFile: 'graphql/jcr/query/getNodeByPath.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 + '")';