@jahia/cypress 3.1.0 → 3.3.0

package/dist/utils/Utils.d.ts

@@ -1,6 +1,8 @@
 export declare const setNodeProperty: (pathOrId: string, property: string, value: string, language: string) => Cypress.Chainable;
+export declare const deleteNodeProperty: (pathOrId: string, property: string, language: string) => Cypress.Chainable;
 export declare const deleteNode: (pathOrId: string) => Cypress.Chainable;
 export declare const grantRoles: (pathOrId: string, roleNames: Array<string>, principalName: string, principalType: string) => Cypress.Chainable;
+export declare const publishAndWaitJobEnding: (path: string, languages?: string[]) => void;
 export declare const waitAllJobsFinished: (errorMessage?: string, timeout?: number) => void;
 export declare const addNode: (variables: {
     parentPathOrId: string;
@@ -9,5 +11,14 @@ export declare const addNode: (variables: {
     properties?: any[];
     children?: any[];
 }) => Cypress.Chainable;
-export declare const getNodeByPath: (path: string) => Cypress.Chainable;
+export declare const getNodeByPath: (path: string, properties?: string[], language?: string) => Cypress.Chainable;
 export declare const createSite: (siteKey: string, templateSet?: string, serverName?: string, locale?: string, languages?: string) => void;
+export declare const deleteSite: (siteKey: string) => void;
+export declare const createUser: (userName: string, password: string, properties?: {
+    name: string;
+    value: string;
+}[]) => void;
+export declare const deleteUser: (userName: string) => void;
+export declare const addVanityUrl: (pathOrId: string, language: string, url: string) => Cypress.Chainable;
+export declare const getVanityUrl: (path: string, languages: Array<string>) => Cypress.Chainable;
+export declare const removeVanityUrl: (pathOrId: string, url: string) => Cypress.Chainable;

package/dist/utils/Utils.js

@@ -1,6 +1,6 @@
 "use strict";
 exports.__esModule = true;
-exports.createSite = exports.getNodeByPath = exports.addNode = exports.waitAllJobsFinished = exports.grantRoles = exports.deleteNode = exports.setNodeProperty = void 0;
+exports.removeVanityUrl = exports.getVanityUrl = exports.addVanityUrl = exports.deleteUser = exports.createUser = exports.deleteSite = exports.createSite = exports.getNodeByPath = exports.addNode = exports.waitAllJobsFinished = exports.publishAndWaitJobEnding = exports.grantRoles = exports.deleteNode = exports.deleteNodeProperty = exports.setNodeProperty = void 0;
 var setNodeProperty = function (pathOrId, property, value, language) {
     return cy.apollo({
         variables: {
@@ -13,6 +13,17 @@ var setNodeProperty = function (pathOrId, property, value, language) {
     });
 };
 exports.setNodeProperty = setNodeProperty;
+var deleteNodeProperty = function (pathOrId, property, language) {
+    return cy.apollo({
+        variables: {
+            pathOrId: pathOrId,
+            property: property,
+            language: language
+        },
+        mutationFile: 'graphql/jcr/mutation/deleteNodeProperty.graphql'
+    });
+};
+exports.deleteNodeProperty = deleteNodeProperty;
 var deleteNode = function (pathOrId) {
     return cy.apollo({
         variables: {
@@ -35,6 +46,20 @@ var grantRoles = function (pathOrId, roleNames, principalName, principalType) {
     });
 };
 exports.grantRoles = grantRoles;
+var publishAndWaitJobEnding = function (path, languages) {
+    if (languages === void 0) { languages = ['en']; }
+    cy.apollo({
+        variables: {
+            pathOrId: path,
+            languages: languages,
+            publishSubNodes: true,
+            includeSubTree: true
+        },
+        mutationFile: 'graphql/jcr/mutation/publishNode.graphql'
+    });
+    exports.waitAllJobsFinished('Publication timeout for node: ' + path, 60000);
+};
+exports.publishAndWaitJobEnding = publishAndWaitJobEnding;
 var waitAllJobsFinished = function (errorMessage, timeout) {
     if (timeout === void 0) { timeout = 60000; }
     cy.waitUntil(function () {
@@ -68,10 +93,12 @@ var addNode = function (variables) {
     });
 };
 exports.addNode = addNode;
-var getNodeByPath = function (path) {
+var getNodeByPath = function (path, properties, language) {
     return cy.apollo({
         variables: {
-            path: path
+            path: path,
+            properties: properties,
+            language: language
         },
         queryFile: 'graphql/jcr/query/getNodeByPath.graphql'
     });
@@ -88,3 +115,58 @@ var createSite = function (siteKey, templateSet, serverName, locale, languages)
     });
 };
 exports.createSite = createSite;
+var deleteSite = function (siteKey) {
+    cy.executeGroovy('groovy/admin/deleteSite.groovy', {
+        SITEKEY: siteKey
+    });
+};
+exports.deleteSite = deleteSite;
+var createUser = function (userName, password, properties) {
+    if (properties === void 0) { properties = []; }
+    var userProperties = properties.map(function (property) {
+        return 'properties.setProperty("' + property.name + '", "' + property.value + '")';
+    });
+    cy.executeGroovy('groovy/admin/createUser.groovy', {
+        USER_NAME: userName,
+        PASSWORD: password ? password : 'password',
+        USER_PROPERTIES: userProperties ? userProperties.join('\n') : ''
+    });
+};
+exports.createUser = createUser;
+var deleteUser = function (userName) {
+    cy.executeGroovy('groovy/admin/deleteUser.groovy', {
+        USER_NAME: userName
+    });
+};
+exports.deleteUser = deleteUser;
+var addVanityUrl = function (pathOrId, language, url) {
+    return cy.apollo({
+        variables: {
+            pathOrId: pathOrId,
+            language: language,
+            url: url
+        },
+        mutationFile: 'graphql/jcr/mutation/addVanityUrl.graphql'
+    });
+};
+exports.addVanityUrl = addVanityUrl;
+var getVanityUrl = function (path, languages) {
+    return cy.apollo({
+        variables: {
+            path: path,
+            languages: languages
+        },
+        queryFile: 'graphql/jcr/query/getVanityUrls.graphql'
+    });
+};
+exports.getVanityUrl = getVanityUrl;
+var removeVanityUrl = function (pathOrId, url) {
+    return cy.apollo({
+        variables: {
+            pathOrId: pathOrId,
+            url: url
+        },
+        mutationFile: 'graphql/jcr/mutation/removeVanityUrl.graphql'
+    });
+};
+exports.removeVanityUrl = removeVanityUrl;

package/fixtures/graphql/jcr/mutation/addVanityUrl.graphql

@@ -0,0 +1,14 @@
+mutation($pathOrId: String!, $language: String!, $url: String!){
+  jcr{
+    mutateNode(pathOrId: $pathOrId){
+      addVanityUrl(vanityUrlInputList: [{
+        language: $language,
+        active: true,
+        defaultMapping: true,
+        url: $url
+      }]){
+        uuid
+      }
+    }
+  }
+}

package/fixtures/graphql/jcr/mutation/deleteNodeProperty.graphql

@@ -0,0 +1,9 @@
+mutation($pathOrId: String!, $property: String!, $language: String){
+  jcr{
+    mutateNode(pathOrId: $pathOrId){
+      mutateProperty(name: $property){
+      	delete(language: $language)
+      }
+    }
+  }
+}

package/fixtures/graphql/jcr/mutation/publishNode.graphql

@@ -0,0 +1,7 @@
+mutation publishNode($pathOrId: String!, $languages: [String]!, $publishSubNodes: Boolean!, $includeSubTree: Boolean!) {
+    jcr(workspace: EDIT) {
+        mutateNode(pathOrId: $pathOrId) {
+            publish(publishSubNodes: $publishSubNodes, languages: $languages, includeSubTree: $includeSubTree)
+        }
+    }
+}

package/fixtures/graphql/jcr/mutation/removeVanityUrl.graphql

@@ -0,0 +1,9 @@
+mutation($pathOrId: String!, $url: String!){
+  jcr {
+    mutateNode(pathOrId: $pathOrId) {
+      mutateVanityUrl(url: $url) {
+        delete
+      }
+    }
+  }
+}

package/fixtures/graphql/jcr/query/getNodeByPath.graphql

@@ -1,9 +1,9 @@
-query getNodeByPath($path: String!, $properties: [String]=[]) {
+query getNodeByPath($path: String!, $properties: [String]=[], $language: String="") {
     jcr {
         nodeByPath(path: $path) {
             uuid
             name
-        	properties(names: $properties){
+        	properties(names: $properties, language: $language){
               name
               value
             }

package/fixtures/graphql/jcr/query/getVanityUrls.graphql

@@ -0,0 +1,9 @@
+query($path: String!, $languages: [String]!) {
+  jcr {
+  	nodeByPath(path: $path){
+	  vanityUrls(languages: $languages){
+      	url
+      }
+    }
+  }
+}

package/fixtures/groovy/admin/createUser.groovy

@@ -0,0 +1,20 @@
+import org.jahia.services.content.JCRCallback
+import org.jahia.services.content.JCRSessionWrapper
+import org.jahia.services.content.JCRTemplate
+import org.jahia.services.usermanager.JahiaUserManagerService
+import javax.jcr.RepositoryException
+
+JCRTemplate.getInstance().doExecuteWithSystemSession(new JCRCallback() {
+    @Override
+    Object doInJCR(JCRSessionWrapper session) throws RepositoryException {
+        log.info("Create user : USER_NAME")
+        JahiaUserManagerService userManagerService = JahiaUserManagerService.getInstance()
+
+        Properties properties = new Properties()
+        USER_PROPERTIES
+
+        userManagerService.createUser("USER_NAME", null, "PASSWORD", properties, session)
+        session.save()
+        return null
+    }
+})

package/fixtures/groovy/admin/deleteUser.groovy

@@ -0,0 +1,17 @@
+import org.jahia.services.content.JCRCallback
+import org.jahia.services.content.JCRSessionWrapper
+import org.jahia.services.content.JCRTemplate
+import org.jahia.services.usermanager.JahiaUserManagerService
+import javax.jcr.RepositoryException
+
+JCRTemplate.getInstance().doExecuteWithSystemSession(new JCRCallback() {
+    @Override
+    Object doInJCR(JCRSessionWrapper session) throws RepositoryException {
+        log.info("Delete user : USER_NAME" );
+
+        JahiaUserManagerService userManagerService = JahiaUserManagerService.getInstance();
+        userManagerService.deleteUser(userManagerService.getUserPath("USER_NAME"), session);
+        session.save();
+        return null;
+    }
+})

package/package.json

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

package/src/utils/Utils.ts

@@ -10,6 +10,17 @@ export const setNodeProperty = (pathOrId: string, property: string, value: strin
     });
 };
 
+export const deleteNodeProperty = (pathOrId: string, property: string, language: string): Cypress.Chainable => {
+    return cy.apollo({
+        variables: {
+            pathOrId: pathOrId,
+            property: property,
+            language: language
+        },
+        mutationFile: 'graphql/jcr/mutation/deleteNodeProperty.graphql'
+    });
+};
+
 export const deleteNode = (pathOrId: string): Cypress.Chainable => {
     return cy.apollo({
         variables: {
@@ -32,6 +43,19 @@ export const grantRoles = (pathOrId: string, roleNames: Array<string>, principal
     });
 };
 
+export const publishAndWaitJobEnding = (path: string, languages: string[] = ['en']): void => {
+    cy.apollo({
+        variables: {
+            pathOrId: path,
+            languages: languages,
+            publishSubNodes: true,
+            includeSubTree: true
+        },
+        mutationFile: 'graphql/jcr/mutation/publishNode.graphql'
+    });
+    waitAllJobsFinished('Publication timeout for node: ' + path, 60000);
+};
+
 export const waitAllJobsFinished = (errorMessage?: string, timeout = 60000): void => {
     cy.waitUntil(
         () =>
@@ -58,23 +82,25 @@ export const waitAllJobsFinished = (errorMessage?: string, timeout = 60000): voi
     cy.wait(2000);
 };
 
-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[] }): Cypress.Chainable => {
     return cy.apollo({
         variables: variables,
         mutationFile: 'graphql/jcr/mutation/addNode.graphql'
     });
 };
 
-export const getNodeByPath = (path: string): Cypress.Chainable => {
+export const getNodeByPath = (path: string, properties?: string[], language?:string): Cypress.Chainable => {
     return cy.apollo({
         variables: {
-            path: path
+            path: path,
+            properties: properties,
+            language: language
         },
         queryFile: 'graphql/jcr/query/getNodeByPath.graphql'
     });
 };
 
-export const createSite = (siteKey: string, templateSet?: string, serverName?: string, locale?: string, languages?: string) => {
+export const createSite = (siteKey: string, templateSet?: string, serverName?: string, locale?: string, languages?: string): void => {
     const definedLocale = locale ? locale : 'en';
     cy.executeGroovy('groovy/admin/createSite.groovy', {
         SITEKEY: siteKey,
@@ -84,3 +110,57 @@ export const createSite = (siteKey: string, templateSet?: string, serverName?: s
         LANGUAGES: languages ? `Arrays.asList(${languages})` : `Arrays.asList("${definedLocale}")`
     });
 };
+
+export const deleteSite = (siteKey: string): void => {
+    cy.executeGroovy('groovy/admin/deleteSite.groovy', {
+        SITEKEY: siteKey
+    });
+};
+
+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 + '")';
+    });
+    cy.executeGroovy('groovy/admin/createUser.groovy', {
+        USER_NAME: userName,
+        PASSWORD: password ? password : 'password',
+        USER_PROPERTIES: userProperties ? userProperties.join('\n') : ''
+    });
+};
+
+export const deleteUser = (userName: string): void => {
+    cy.executeGroovy('groovy/admin/deleteUser.groovy', {
+        USER_NAME: userName
+    });
+};
+
+export const addVanityUrl = (pathOrId: string, language: string, url: string): Cypress.Chainable => {
+    return cy.apollo({
+        variables: {
+            pathOrId: pathOrId,
+            language: language,
+            url: url
+        },
+        mutationFile: 'graphql/jcr/mutation/addVanityUrl.graphql'
+    });
+};
+
+export const getVanityUrl = (path: string, languages: Array<string>): Cypress.Chainable => {
+    return cy.apollo({
+        variables: {
+            path: path,
+            languages: languages
+        },
+        queryFile: 'graphql/jcr/query/getVanityUrls.graphql'
+    });
+};
+
+export const removeVanityUrl = (pathOrId: string, url: string): Cypress.Chainable => {
+    return cy.apollo({
+        variables: {
+            pathOrId: pathOrId,
+            url: url
+        },
+        mutationFile: 'graphql/jcr/mutation/removeVanityUrl.graphql'
+    });
+};