@jahia/cypress 1.0.8 → 1.1.0

package/.graphqlconfig

@@ -0,0 +1,16 @@
+{
+  "name": "Untitled GraphQL Schema",
+  "schemaPath": "schema.graphql",
+  "extensions": {
+    "endpoints": {
+      "Default GraphQL Endpoint": {
+        "url": "http://localhost:8080/modules/graphql",
+        "headers": {
+          "user-agent": "JS GraphQL",
+          "Authorization": "Basic cm9vdDpyb290MTIzNA=="
+        },
+        "introspect": true
+      }
+    }
+  }
+}

package/README.md

@@ -14,6 +14,8 @@
 
 [`.logout()`](./src/support/logout.md)
 
+[`.repeatUntil()`](./src/support/repeatUntil.md)
+
 ## Page / component objects
 
 In Page Object Model, a set of object is provided to handle known and reused web elements. 

package/dist/page-object/baseComponent.d.ts

@@ -5,10 +5,12 @@ export declare type ComponentType<Component> = {
     defaultSelector: string;
 };
 export declare class BaseComponent {
+    static defaultSelector: string;
     static count: number;
     element: Chainable<JQuery>;
     id: number;
     assertion?: (s: JQuery) => void;
     constructor(element: Chainable<JQuery>, assertion?: (s: JQuery) => void);
     get(): Chainable<JQuery>;
+    should(arg: any, ...others: any[]): Chainable<JQuery<HTMLElement>>;
 }

package/dist/page-object/baseComponent.js

@@ -1,4 +1,9 @@
 "use strict";
+var __spreadArray = (this && this.__spreadArray) || function (to, from) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+};
 exports.__esModule = true;
 exports.BaseComponent = void 0;
 var BaseComponent = /** @class */ (function () {
@@ -13,6 +18,15 @@ var BaseComponent = /** @class */ (function () {
         }
         return cy.get('@component' + this.id, { log: false });
     };
+    BaseComponent.prototype.should = function (arg) {
+        var _a;
+        var others = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            others[_i - 1] = arguments[_i];
+        }
+        return (_a = cy.get('@component' + this.id, { log: false })).should.apply(_a, __spreadArray([arg], others));
+    };
+    BaseComponent.defaultSelector = '';
     BaseComponent.count = 0;
     return BaseComponent;
 }());

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

@@ -23,14 +23,18 @@ var Menu = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     Menu.prototype.select = function (item) {
+        // eslint-disable-next-line cypress/no-unnecessary-waiting
+        cy.wait(500);
         this.get().find(".moonstone-menuItem").should("contain", item).contains(item).trigger('click');
         return this;
     };
     Menu.prototype.selectByRole = function (item) {
+        // eslint-disable-next-line cypress/no-unnecessary-waiting
+        cy.wait(500);
         this.get().find(".moonstone-menuItem[data-sel-role=\"" + item + "\"]").trigger('click');
         return this;
     };
-    Menu.defaultSelector = '.moonstone-menu';
+    Menu.defaultSelector = '.moonstone-menu:visible';
     return Menu;
 }(baseComponent_1.BaseComponent));
 exports.Menu = Menu;

package/dist/support/fixture.js

@@ -16,7 +16,6 @@ var fixture = function (originalCommand, fixture) {
         return originalCommand.apply(void 0, __spreadArray([fixture], args)).then(function (f) {
             return f;
         })["catch"](function (err) {
-            console.log(err);
             return null;
         });
     }).then(function (file) {
@@ -25,7 +24,12 @@ var fixture = function (originalCommand, fixture) {
             if (typeof args[0] === 'string') {
                 encoding = args[0];
             }
-            cy.readFile('./node_modules/@jahia/cypress/fixtures/' + fixture, encoding, { log: false, timeout: 0 });
+            try {
+                cy.readFile('./node_modules/@jahia/cypress/fixtures/' + fixture, encoding, { log: false, timeout: 0 });
+            }
+            catch (e) {
+                console.log(e);
+            }
         }
     });
 };

package/dist/support/index.d.ts

@@ -2,3 +2,4 @@ export * from './apollo';
 export * from './provisioning';
 export * from './login';
 export * from './logout';
+export * from './repeatUntil';

package/dist/support/index.js

@@ -14,3 +14,4 @@ __exportStar(require("./apollo"), exports);
 __exportStar(require("./provisioning"), exports);
 __exportStar(require("./login"), exports);
 __exportStar(require("./logout"), exports);
+__exportStar(require("./repeatUntil"), exports);

package/dist/support/provisioning/executeGroovy.d.ts

@@ -3,10 +3,16 @@ declare global {
         interface Chainable<Subject> {
             executeGroovy(scriptFile: string, replacements?: {
                 [key: string]: string;
-            }): Chainable<any>;
+            }, jahiaServer?: JahiaServer): Chainable<any>;
         }
     }
 }
+declare type JahiaServer = {
+    url: string;
+    username: string;
+    password: string;
+};
 export declare const executeGroovy: (scriptFile: string, replacements?: {
     [key: string]: string;
-}) => void;
+}, jahiaServer?: JahiaServer) => void;
+export {};

package/dist/support/provisioning/executeGroovy.js

@@ -3,7 +3,13 @@
 exports.__esModule = true;
 exports.executeGroovy = void 0;
 /// <reference types="cypress" />
-var executeGroovy = function (scriptFile, replacements) {
+var serverDefaults = {
+    url: Cypress.config().baseUrl,
+    username: 'root',
+    password: Cypress.env('SUPER_USER_PASSWORD')
+};
+var executeGroovy = function (scriptFile, replacements, jahiaServer) {
+    if (jahiaServer === void 0) { jahiaServer = serverDefaults; }
     cy.runProvisioningScript({
         fileContent: '- executeScript: "' + scriptFile + '"',
         type: 'application/yaml'
@@ -11,6 +17,6 @@ var executeGroovy = function (scriptFile, replacements) {
             fileName: scriptFile,
             replacements: replacements,
             type: 'text/plain'
-        }]).then(function (r) { return r[0]; });
+        }], jahiaServer).then(function (r) { return r[0]; });
 };
 exports.executeGroovy = executeGroovy;

package/dist/support/provisioning/runProvisioningScript.d.ts

@@ -2,7 +2,7 @@
 declare global {
     namespace Cypress {
         interface Chainable<Subject> {
-            runProvisioningScript(script: FormFile, files?: FormFile[]): Chainable<any>;
+            runProvisioningScript(script: FormFile, files?: FormFile[], jahiaServer?: JahiaServer): Chainable<any>;
         }
     }
 }
@@ -15,5 +15,10 @@ declare type FormFile = {
         [key: string]: string;
     };
 };
-export declare const runProvisioningScript: (script: FormFile, files?: FormFile[], options?: Cypress.Loggable) => void;
+declare type JahiaServer = {
+    url: string;
+    username: string;
+    password: string;
+};
+export declare const runProvisioningScript: (script: FormFile, files?: FormFile[], jahiaServer?: JahiaServer, options?: Cypress.Loggable) => void;
 export {};

package/dist/support/provisioning/runProvisioningScript.js

@@ -27,7 +27,13 @@ function append(formFile, formData, key) {
         });
     }
 }
-var runProvisioningScript = function (script, files, options) {
+var serverDefaults = {
+    url: Cypress.config().baseUrl,
+    username: 'root',
+    password: Cypress.env('SUPER_USER_PASSWORD')
+};
+var runProvisioningScript = function (script, files, jahiaServer, options) {
+    if (jahiaServer === void 0) { jahiaServer = serverDefaults; }
     if (options === void 0) { options = { log: true }; }
     var formData = new FormData();
     append(script, formData, "script");
@@ -56,11 +62,11 @@ var runProvisioningScript = function (script, files, options) {
         });
     }
     cy.request({
-        url: Cypress.config().baseUrl + "/modules/api/provisioning",
+        url: jahiaServer.url + "/modules/api/provisioning",
         method: 'POST',
         auth: {
-            user: 'root',
-            pass: Cypress.env('SUPER_USER_PASSWORD'),
+            user: jahiaServer.username,
+            pass: jahiaServer.password,
             sendImmediately: true
         },
         body: formData,

package/dist/support/registerSupport.js

@@ -10,6 +10,7 @@ var login_1 = require("./login");
 var logout_1 = require("./logout");
 var installLogsCollector_1 = __importDefault(require("cypress-terminal-report/src/installLogsCollector"));
 var fixture_1 = require("./fixture");
+var repeatUntil_1 = require("./repeatUntil");
 var registerSupport = function () {
     Cypress.Commands.add('apolloClient', apollo_1.apolloClient);
     Cypress.Commands.add('apollo', { prevSubject: 'optional' }, apollo_1.apollo);
@@ -17,6 +18,7 @@ var registerSupport = function () {
     Cypress.Commands.add('executeGroovy', provisioning_1.executeGroovy);
     Cypress.Commands.add('login', login_1.login);
     Cypress.Commands.add('logout', logout_1.logout);
+    Cypress.Commands.add('repeatUntil', repeatUntil_1.repeatUntil);
     Cypress.Commands.overwrite('fixture', fixture_1.fixture);
     installLogsCollector_1["default"]();
 };

package/dist/support/repeatUntil.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="cypress" />
+declare type RepeatUntilOptions = {
+    attempts: number;
+    callback: () => void;
+    delay: number;
+};
+declare global {
+    namespace Cypress {
+        interface Chainable<Subject> {
+            repeatUntil(selector: string, options?: Partial<RepeatUntilOptions>): Chainable<JQuery>;
+        }
+    }
+}
+export declare const repeatUntil: (selector: string, options?: Partial<RepeatUntilOptions>) => void;
+export {};

package/dist/support/repeatUntil.js

@@ -0,0 +1,52 @@
+"use strict";
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-namespace */
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+exports.__esModule = true;
+exports.repeatUntil = void 0;
+var defaultOptions = {
+    attempts: 10,
+    callback: function () { return cy.reload({ log: false }); },
+    delay: 1000
+};
+var repeatUntil = function (selector, options) {
+    if (options === void 0) { options = {}; }
+    options = __assign(__assign({}, defaultOptions), options);
+    var log = Cypress.log({
+        name: 'repeatUntil',
+        message: "Reload until " + selector + ", remaining attempts : " + options.attempts,
+        consoleProps: function () {
+            return {
+                attempts: options.attempts
+            };
+        }
+    });
+    var items = Cypress.$(selector);
+    if (items.length) {
+        log.set({ $el: items });
+        cy.wrap(items, { log: false });
+        return;
+    }
+    if (options.attempts > 1) {
+        log.end();
+        options.callback();
+        // eslint-disable-next-line cypress/no-unnecessary-waiting
+        cy.wait(options.delay);
+        cy.repeatUntil(selector, __assign(__assign({}, options), { attempts: options.attempts - 1 }));
+    }
+    else {
+        var err = Error('Items not found.');
+        log.error(err);
+        throw err;
+    }
+};
+exports.repeatUntil = repeatUntil;

package/fixtures/graphql/jcr/addNode.graphql

@@ -0,0 +1,16 @@
+mutation($parentPathOrId: String!, $nodeName: String!, $nodeType: String!, $children: [InputJCRNode] = [],
+    $properties: [InputJCRProperty]) {
+    jcr(workspace: EDIT) {
+        addNode(
+            parentPathOrId: $parentPathOrId,
+            name: $nodeName,
+            primaryNodeType: $nodeType,
+            properties: $properties,
+        ) {
+            addChildrenBatch(nodes: $children){
+                uuid
+            }
+            uuid
+        }
+    }
+}

package/fixtures/graphql/jcr/deleteNode.graphql

@@ -0,0 +1,5 @@
+mutation($pathOrId: String!) {
+    jcr(workspace: EDIT) {
+        deleteNode(pathOrId: $pathOrId)
+    }
+}

package/fixtures/graphql/jcr/mutateNode.graphql

@@ -0,0 +1,13 @@
+mutation($pathOrId: String!, $children: [InputJCRNode] = [], $properties: [InputJCRProperty] = []) {
+    jcr(workspace: EDIT) {
+        mutateNode(pathOrId: $pathOrId) {
+            setPropertiesBatch(properties: $properties) {
+                path
+            }
+            addChildrenBatch(nodes: $children){
+                uuid
+            }
+            uuid
+        }
+    }
+}

package/fixtures/groovy/admin/createSite.groovy

@@ -0,0 +1,14 @@
+import org.jahia.services.sites.JahiaSite
+import org.jahia.services.sites.JahiaSitesService
+import org.jahia.services.sites.SiteCreationInfo
+
+JahiaSitesService sitesService = JahiaSitesService.getInstance();
+if (sitesService.getSiteByKey("SITEKEY") == null) {
+    JahiaSite site = sitesService.addSite(SiteCreationInfo.builder().
+            siteKey("SITEKEY").
+            serverName("localhost").
+            title("SITEKEY").
+            templateSet("TEMPLATES_SET").
+            locale("en").build())
+}
+

package/fixtures/groovy/admin/deleteSite.groovy

@@ -0,0 +1,6 @@
+import org.jahia.services.sites.JahiaSitesService
+
+JahiaSitesService sitesService = JahiaSitesService.getInstance();
+if (sitesService.getSiteByKey("SITEKEY") != null) {
+    sitesService.removeSite(sitesService.getSiteByKey("SITEKEY"));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/cypress",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "scripts": {
     "build": "tsc",
     "lint": "eslint src -c .eslintrc.json --ext .ts"
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@apollo/client": "^3.4.9",
-    "cypress-terminal-report": "^3.3.2",
+    "cypress-terminal-report": "^3.4.2",
     "graphql": "^15.5.0",
     "graphql-tag": "^2.11.0"
   }