@jahia/cypress 1.0.10 → 1.1.0

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

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/cypress",
-  "version": "1.0.10",
+  "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"
   }

package/src/support/provisioning/executeGroovy.md

@@ -10,6 +10,7 @@ This commands execute a groovy script from fixtures folder
 
 ```
 cy.executeGroovy('script.groovy')
+cy.executeGroovy('script.groovy', null, {url: 'http://jahia-processing.jahia.net:8080', username: 'root', password: 'root1234'})
 ```
 
 ### Arguments
@@ -18,6 +19,14 @@ cy.executeGroovy('script.groovy')
 
 The name of the script file, in fixtures folder
 
+#### > jahiaServer (`JahiaServer`)
+
+A Jahia server can be specified if there is a need to use something other than default. This is useful when using Jahia in cluster, if there is a need to redirect a provisioning script to a specific Jahia server (for example a processig node).
+
+- url: (`string`) : The url of the server (for example: http://processing.jahia.net:8080)
+- username: (`string`) : Root user
+- password: (`string`) : Password for the root user
+
 ### Yields
 
 The groovy script result (set with `setResult()` within groovy code)

package/src/support/provisioning/executeGroovy.ts

@@ -9,12 +9,24 @@ declare global {
     namespace Cypress {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         interface Chainable<Subject> {
-            executeGroovy(scriptFile: string, replacements?: { [key: string]: string }): Chainable<any>
+            executeGroovy(scriptFile: string, replacements?: { [key: string]: string }, jahiaServer?: JahiaServer): Chainable<any>
         }
     }
 }
 
-export const executeGroovy = function (scriptFile: string, replacements?: { [key: string]: string }): void {
+type JahiaServer = {
+    url: string;
+    username: string;
+    password: string
+}
+
+const serverDefaults = {
+    url: Cypress.config().baseUrl,
+    username: 'root',
+    password: Cypress.env('SUPER_USER_PASSWORD')
+}
+
+export const executeGroovy = function (scriptFile: string, replacements?: { [key: string]: string }, jahiaServer: JahiaServer = serverDefaults): void {
     cy.runProvisioningScript({
         fileContent: '- executeScript: "' + scriptFile + '"',
         type: 'application/yaml'
@@ -22,5 +34,5 @@ export const executeGroovy = function (scriptFile: string, replacements?: { [key
         fileName: scriptFile,
         replacements,
         type: 'text/plain'
-    }]).then(r => r[0])
+    }], jahiaServer).then(r => r[0])
 }

package/src/support/provisioning/runProvisioningScript.md

@@ -12,6 +12,7 @@ This commands execute a provisioning script
 cy.runProvisioningScript({fileName:'prov.yaml', type:'application/yaml'})
 cy.runProvisioningScript({fileName:'prov.yaml', type:'application/yaml'}, [{fileName: 'file1.zip'}])
 cy.runProvisioningScript({fileContent:'- startBundle: "module"', type:'application/yaml'})
+cy.runProvisioningScript({fileContent:'- startBundle: "module"', type:'application/yaml'}, null, {url: 'http://jahia-processing.jahia.net:8080', username: 'root', password: 'root1234'})
 ```
 
 ### Arguments
@@ -24,6 +25,14 @@ The script can be specified either from an external file (using fileName) or inl
 - fileContent: (`string`) : The content of the script. If specified, fileName is ignored.
 - type: (`string`) : Content type, either `application/yaml` or `application/json`
 
+#### > jahiaServer (`JahiaServer`)
+
+A Jahia server can be specified if there is a need to use something other than default. This is useful when using Jahia in cluster, if there is a need to redirect a provisioning script to a specific Jahia server (for example a processig node).
+
+- url: (`string`) : The url of the server (for example: http://processing.jahia.net:8080)
+- username: (`string`) : Root user
+- password: (`string`) : Password for the root user
+
 #### > files (`FormFile[]`)
 
 Additional files that can be referenced in the script. When an operation requires a URL, directly specify the file name (without protocol) to use one these files

package/src/support/provisioning/runProvisioningScript.ts

@@ -9,7 +9,7 @@ declare global {
     namespace Cypress {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         interface Chainable<Subject> {
-            runProvisioningScript(script: FormFile, files?: FormFile[]): Chainable<any>
+            runProvisioningScript(script: FormFile, files?: FormFile[], jahiaServer?: JahiaServer): Chainable<any>
         }
     }
 }
@@ -22,6 +22,12 @@ type FormFile = {
     replacements?: { [key: string]: string }
 }
 
+type JahiaServer = {
+    url: string;
+    username: string;
+    password: string
+}
+
 function processContent(formFile: FormFile) {
     let content = formFile.fileContent;
     if (formFile.replacements) {
@@ -46,7 +52,13 @@ function append(formFile: FormFile, formData: FormData, key: string) {
     }
 }
 
-export const runProvisioningScript = (script: FormFile, files?: FormFile[], options: Cypress.Loggable = {log:true}): void => {
+const serverDefaults: JahiaServer = {
+    url: Cypress.config().baseUrl,
+    username: 'root',
+    password: Cypress.env('SUPER_USER_PASSWORD')
+}
+
+export const runProvisioningScript = (script: FormFile, files?: FormFile[], jahiaServer: JahiaServer = serverDefaults, options: Cypress.Loggable = {log:true}): void => {
     const formData = new FormData()
 
     append(script, formData, "script")
@@ -78,11 +90,11 @@ export const runProvisioningScript = (script: FormFile, files?: FormFile[], opti
     }
 
     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/.idea/jahia-cypress.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/jahia-cypress.iml" filepath="$PROJECT_DIR$/.idea/jahia-cypress.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/sonarlint/issuestore/8/9/8995cd54601f633e8bca96b4e0b06ae4272afe02

@@ -1,3 +0,0 @@
-
-Otypescript:S1117".'args' is already declared in the upper scope.(��������

-Rtypescript:S1117"1'fixture' is already declared in the upper scope.(��������

package/.idea/sonarlint/issuestore/index.pb

@@ -1,3 +0,0 @@
-
-F
-src/support/fixture.ts,8/9/8995cd54601f633e8bca96b4e0b06ae4272afe02

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

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

@@ -1,10 +0,0 @@
-/// <reference types="cypress" />
-import { BaseComponent } from "./baseComponent";
-import Chainable = Cypress.Chainable;
-export declare class IFrame extends BaseComponent {
-    static defaultSelector: string;
-    private body;
-    constructor(element: Chainable<JQuery>, assertion?: (s: JQuery) => void);
-    getBody(): Chainable<JQuery>;
-    enter(): void;
-}

package/dist/page-object/iframe.js

@@ -1,46 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-exports.__esModule = true;
-exports.IFrame = void 0;
-var baseComponent_1 = require("./baseComponent");
-var IFrame = /** @class */ (function (_super) {
-    __extends(IFrame, _super);
-    function IFrame(element, assertion) {
-        var _this = _super.call(this, element, assertion) || this;
-        _this.get()
-            .should(function (f) {
-            var fr = f[0];
-            expect(fr.contentWindow.location.href).not.equals('about:blank');
-            expect(fr.contentWindow.document.readyState).equals('complete');
-            expect(fr.contentDocument.body).not.be.empty;
-        })
-            .its('0.contentDocument.body').as('framebody' + _this.id);
-        return _this;
-    }
-    IFrame.prototype.getBody = function () {
-        return cy.get('@framebody' + this.id);
-    };
-    IFrame.prototype.enter = function () {
-        this.get().then(function (f) {
-            var fr = f[0];
-            cy.visit(fr.contentWindow.location.href);
-        });
-    };
-    IFrame.defaultSelector = 'iframe';
-    return IFrame;
-}(baseComponent_1.BaseComponent));
-exports.IFrame = IFrame;

package/dist/page-object/moonstone/muiinput.d.ts

@@ -1,8 +0,0 @@
-/// <reference types="cypress" />
-import { BaseComponent } from "../baseComponent";
-import TypeOptions = Cypress.TypeOptions;
-export declare class MUIInput extends BaseComponent {
-    static defaultSelector: string;
-    clear(): MUIInput;
-    type(text: string, options?: Partial<TypeOptions>): MUIInput;
-}

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

@@ -1,36 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-exports.__esModule = true;
-exports.MUIInput = void 0;
-var baseComponent_1 = require("../baseComponent");
-var MUIInput = /** @class */ (function (_super) {
-    __extends(MUIInput, _super);
-    function MUIInput() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    MUIInput.prototype.clear = function () {
-        this.get().clear();
-        return this;
-    };
-    MUIInput.prototype.type = function (text, options) {
-        this.get().type(text, options);
-        return this;
-    };
-    MUIInput.defaultSelector = 'div';
-    return MUIInput;
-}(baseComponent_1.BaseComponent));
-exports.MUIInput = MUIInput;

package/dist/page-object/moonstone/muiradio.d.ts

@@ -1,5 +0,0 @@
-import { BaseComponent } from "../baseComponent";
-export declare class MUIRadio extends BaseComponent {
-    static defaultSelector: string;
-    click(): MUIRadio;
-}

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

@@ -1,32 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-exports.__esModule = true;
-exports.MUIRadio = void 0;
-var baseComponent_1 = require("../baseComponent");
-var MUIRadio = /** @class */ (function (_super) {
-    __extends(MUIRadio, _super);
-    function MUIRadio() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    MUIRadio.prototype.click = function () {
-        this.get().click();
-        return this;
-    };
-    MUIRadio.defaultSelector = 'label';
-    return MUIRadio;
-}(baseComponent_1.BaseComponent));
-exports.MUIRadio = MUIRadio;

package/dist/support/reloadUntil.d.ts

@@ -1,15 +0,0 @@
-/// <reference types="cypress" />
-declare type ReloadUntilOptions = {
-    attempts: number;
-    reloadCallback: () => void;
-    delay: number;
-};
-declare global {
-    namespace Cypress {
-        interface Chainable<Subject> {
-            reloadUntil(selector: string, options: Partial<ReloadUntilOptions>): Chainable<Cypress.Response<any>>;
-        }
-    }
-}
-export declare const reloadUntil: (selector: string, options: Partial<ReloadUntilOptions>) => void;
-export {};

package/dist/support/reloadUntil.js

@@ -1,50 +0,0 @@
-"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.reloadUntil = void 0;
-var defaultOptions = {
-    attempts: 10,
-    reloadCallback: function () { return cy.reload({ log: false }); },
-    delay: 1000
-};
-var reloadUntil = function (selector, options) {
-    options = __assign(__assign({}, defaultOptions), options);
-    var log = Cypress.log({
-        name: 'reloadUntil',
-        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 });
-        return;
-    }
-    if (options.attempts > 1) {
-        log.end();
-        options.reloadCallback();
-        // eslint-disable-next-line cypress/no-unnecessary-waiting
-        cy.wait(options.delay);
-        cy.reloadUntil(selector, __assign(__assign({}, options), { attempts: options.attempts - 1 }));
-    }
-    else {
-        var err = Error('Items not found.');
-        log.error(err);
-        throw err;
-    }
-};
-exports.reloadUntil = reloadUntil;

package/dist/support/waitUntil.d.ts

@@ -1,15 +0,0 @@
-/// <reference types="cypress" />
-declare type ReloadUntilOptions = {
-    attempts: number;
-    reloadCallback: () => void;
-    delay: number;
-};
-declare global {
-    namespace Cypress {
-        interface Chainable<Subject> {
-            reloadUntil(selector: string, options: Partial<ReloadUntilOptions>): Chainable<Cypress.Response<any>>;
-        }
-    }
-}
-export declare const reloadUntil: (selector: string, options: Partial<ReloadUntilOptions>) => void;
-export {};

package/dist/support/waitUntil.js

@@ -1,44 +0,0 @@
-"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.reloadUntil = void 0;
-var defaultOptions = {
-    attempts: 10,
-    reloadCallback: function () { return cy.reload({ log: false }); },
-    delay: 1000
-};
-var reloadUntil = function (selector, options) {
-    options = __assign(__assign({}, defaultOptions), options);
-    var log = Cypress.log({
-        name: 'reloadUntil',
-        message: "Reload until " + selector + ", remaining attempts : " + options.attempts
-    });
-    var $items = Cypress.$(selector);
-    if ($items.length) {
-        return;
-    }
-    if (options.attempts > 1) {
-        log.finish();
-        options.reloadCallback();
-        // eslint-disable-next-line cypress/no-unnecessary-waiting
-        cy.wait(1000, { log: false });
-        cy.reloadUntil(selector, __assign(__assign({}, options), { attempts: options.attempts - 1 }));
-    }
-    else {
-        var err = Error('Items not found.');
-        log.error(err);
-        throw err;
-    }
-};
-exports.reloadUntil = reloadUntil;

package/yalc.lock

@@ -1,9 +0,0 @@
-{
-  "version": "v1",
-  "packages": {
-    "@jahia/cypress": {
-      "signature": "1028ca2fa2d0700a1ab74a8ede774e57",
-      "file": true
-    }
-  }
-}