@jahia/cypress 1.1.0 → 1.1.3

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

@@ -0,0 +1,6 @@
+import { BaseComponent } from "../baseComponent";
+export declare class Collapsible extends BaseComponent {
+    static defaultSelector: string;
+    collapse(): Collapsible;
+    expand(): Collapsible;
+}

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

@@ -0,0 +1,46 @@
+"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.Collapsible = void 0;
+var baseComponent_1 = require("../baseComponent");
+var Collapsible = /** @class */ (function (_super) {
+    __extends(Collapsible, _super);
+    function Collapsible() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Collapsible.prototype.collapse = function () {
+        var _this = this;
+        this.get().children('div').then(function ($child) {
+            if ($child.hasClass('moonstone-collapsible_content_expanded')) {
+                _this.get().find('.moonstone-collapsible_button').click();
+            }
+        });
+        return this;
+    };
+    Collapsible.prototype.expand = function () {
+        var _this = this;
+        this.get().children('div').then(function ($child) {
+            if ($child.hasClass('moonstone-collapsible_content_collapsed')) {
+                _this.get().find('.moonstone-collapsible_button').click().scrollIntoView();
+            }
+        });
+        return this;
+    };
+    Collapsible.defaultSelector = '.moonstone-collapsible';
+    return Collapsible;
+}(baseComponent_1.BaseComponent));
+exports.Collapsible = Collapsible;

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

@@ -1,5 +1,6 @@
 export * from './accordion';
 export * from './button';
+export * from './collapsible';
 export * from './dropdown';
 export * from './menu';
 export * from './pagination';

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

@@ -12,6 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 exports.__esModule = true;
 __exportStar(require("./accordion"), exports);
 __exportStar(require("./button"), exports);
+__exportStar(require("./collapsible"), exports);
 __exportStar(require("./dropdown"), exports);
 __exportStar(require("./menu"), exports);
 __exportStar(require("./pagination"), exports);

package/dist/support/apollo/apollo.d.ts

@@ -7,12 +7,11 @@ declare global {
         }
     }
 }
-declare type FileQueryOptions = Partial<QueryOptions> & {
+export declare type FileQueryOptions = Partial<QueryOptions> & {
     queryFile?: string;
 };
-declare type FileMutationOptions = Partial<MutationOptions> & {
+export declare type FileMutationOptions = Partial<MutationOptions> & {
     mutationFile?: string;
 };
-declare type ApolloOptions = (QueryOptions | MutationOptions | FileQueryOptions | FileMutationOptions) & Partial<Cypress.Loggable>;
+export declare type ApolloOptions = (QueryOptions | MutationOptions | FileQueryOptions | FileMutationOptions) & Partial<Cypress.Loggable>;
 export declare const apollo: (apollo: ApolloClient<any>, options: ApolloOptions) => void;
-export {};

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

@@ -1,2 +1,3 @@
 export * from './executeGroovy';
 export * from './runProvisioningScript';
+export * from './installBundle';

package/dist/support/provisioning/index.js

@@ -12,3 +12,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 exports.__esModule = true;
 __exportStar(require("./executeGroovy"), exports);
 __exportStar(require("./runProvisioningScript"), exports);
+__exportStar(require("./installBundle"), exports);

package/dist/support/provisioning/installBundle.js

@@ -4,10 +4,7 @@ exports.__esModule = true;
 exports.installBundle = void 0;
 /// <reference types="cypress" />
 var installBundle = function (bundleFile) {
-    cy.runProvisioningScript({
-        fileContent: '- installBundle: "' + bundleFile + '"',
-        type: 'application/yaml'
-    }, [{
+    cy.runProvisioningScript([{ installBundle: bundleFile }], [{
             fileName: bundleFile,
             type: 'text/plain'
         }]);

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

@@ -2,23 +2,23 @@
 declare global {
     namespace Cypress {
         interface Chainable<Subject> {
-            runProvisioningScript(script: FormFile, files?: FormFile[], jahiaServer?: JahiaServer): Chainable<any>;
+            runProvisioningScript(script: FormFile | StringDictionary[], files?: FormFile[], jahiaServer?: JahiaServer): Chainable<any>;
         }
     }
 }
-declare type FormFile = {
+export declare type StringDictionary = {
+    [key: string]: string;
+};
+export declare type FormFile = {
     fileName?: string;
     fileContent?: string;
     type?: string;
     encoding?: Cypress.Encodings;
-    replacements?: {
-        [key: string]: string;
-    };
+    replacements?: StringDictionary;
 };
-declare type JahiaServer = {
+export declare type JahiaServer = {
     url: string;
     username: string;
     password: string;
 };
-export declare const runProvisioningScript: (script: FormFile, files?: FormFile[], jahiaServer?: JahiaServer, options?: Cypress.Loggable) => void;
-export {};
+export declare const runProvisioningScript: (script: FormFile | StringDictionary[], files?: FormFile[], jahiaServer?: JahiaServer, options?: Cypress.Loggable) => void;

package/dist/support/provisioning/runProvisioningScript.js

@@ -15,7 +15,7 @@ function append(formFile, formData, key) {
     if (formFile.fileContent) {
         formData.append(key, processContent(formFile), formFile.fileName);
     }
-    else {
+    else if (formFile.fileName) {
         cy.fixture(formFile.fileName, (formFile.encoding ? formFile.encoding : 'binary')).then(function (content) {
             if (typeof content === 'object') {
                 formFile.fileContent = JSON.stringify(content);
@@ -32,11 +32,22 @@ var serverDefaults = {
     username: 'root',
     password: Cypress.env('SUPER_USER_PASSWORD')
 };
+function isFormFile(script) {
+    return Boolean(script.fileContent || script.fileName);
+}
 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");
+    if (isFormFile(script)) {
+        append(script, formData, "script");
+    }
+    else {
+        append({
+            fileContent: JSON.stringify(script),
+            type: 'application/json'
+        }, formData, "script");
+    }
     if (files) {
         files.forEach(function (f) {
             append(f, formData, "file");
@@ -50,7 +61,7 @@ var runProvisioningScript = function (script, files, jahiaServer, options) {
             autoEnd: false,
             name: 'runProvisioningScript',
             displayName: 'provScript',
-            message: "Run " + (script.fileName ? script.fileName : 'inline script'),
+            message: "Run " + (isFormFile(script) && script.fileName ? script.fileName : 'inline script') + " towards server: " + jahiaServer.url,
             consoleProps: function () {
                 return {
                     Script: script,

package/dist/support/registerSupport.js

@@ -16,6 +16,7 @@ var registerSupport = function () {
     Cypress.Commands.add('apollo', { prevSubject: 'optional' }, apollo_1.apollo);
     Cypress.Commands.add('runProvisioningScript', provisioning_1.runProvisioningScript);
     Cypress.Commands.add('executeGroovy', provisioning_1.executeGroovy);
+    Cypress.Commands.add('installBundle', provisioning_1.installBundle);
     Cypress.Commands.add('login', login_1.login);
     Cypress.Commands.add('logout', logout_1.logout);
     Cypress.Commands.add('repeatUntil', repeatUntil_1.repeatUntil);

package/dist/support/repeatUntil.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-declare type RepeatUntilOptions = {
+export declare type RepeatUntilOptions = {
     attempts: number;
     callback: () => void;
     delay: number;
@@ -12,4 +12,3 @@ declare global {
     }
 }
 export declare const repeatUntil: (selector: string, options?: Partial<RepeatUntilOptions>) => void;
-export {};

package/jahia-cypress.iml

@@ -0,0 +1,11 @@
+<?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$">
+      <sourceFolder url="file://$MODULE_DIR$/fixtures/groovy/admin" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/package.json

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

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

@@ -0,0 +1,24 @@
+import {BaseComponent} from "../baseComponent"
+
+
+export class Collapsible extends BaseComponent {
+    static defaultSelector = '.moonstone-collapsible'
+
+    collapse(): Collapsible {
+        this.get().children('div').then(($child) => {
+            if ($child.hasClass('moonstone-collapsible_content_expanded')) {
+                this.get().find('.moonstone-collapsible_button').click()
+            }
+        })
+        return this
+    }
+
+    expand(): Collapsible {
+        this.get().children('div').then(($child) => {
+            if ($child.hasClass('moonstone-collapsible_content_collapsed')) {
+                this.get().find('.moonstone-collapsible_button').click().scrollIntoView()
+            }
+        })
+        return this
+    }
+}

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

@@ -1,5 +1,6 @@
 export * from './accordion'
 export * from './button'
+export * from './collapsible'
 export * from './dropdown'
 export * from './menu'
 export * from './pagination'

package/src/support/apollo/apollo.ts

@@ -15,9 +15,9 @@ declare global {
     }
 }
 
-type FileQueryOptions = Partial<QueryOptions> & { queryFile?: string }
-type FileMutationOptions = Partial<MutationOptions> & { mutationFile?: string }
-type ApolloOptions = (QueryOptions | MutationOptions | FileQueryOptions | FileMutationOptions) & Partial<Cypress.Loggable>;
+export type FileQueryOptions = Partial<QueryOptions> & { queryFile?: string }
+export type FileMutationOptions = Partial<MutationOptions> & { mutationFile?: string }
+export type ApolloOptions = (QueryOptions | MutationOptions | FileQueryOptions | FileMutationOptions) & Partial<Cypress.Loggable>;
 
 function isQuery(options: ApolloOptions): options is QueryOptions {
     return (<QueryOptions>options).query !== undefined;

package/src/support/provisioning/index.ts

@@ -1,2 +1,3 @@
 export * from './executeGroovy'
 export * from './runProvisioningScript'
+export * from './installBundle'

package/src/support/provisioning/installBundle.ts

@@ -15,11 +15,8 @@ declare global {
 }
 
 export const installBundle = function (bundleFile: string): void {
-    cy.runProvisioningScript({
-        fileContent: '- installBundle: "' + bundleFile + '"',
-        type: 'application/yaml'
-    }, [{
+    cy.runProvisioningScript([{ installBundle: bundleFile }], [{
         fileName: bundleFile,
         type: 'text/plain'
     }])
-}
+}

package/src/support/provisioning/runProvisioningScript.ts

@@ -9,20 +9,22 @@ declare global {
     namespace Cypress {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         interface Chainable<Subject> {
-            runProvisioningScript(script: FormFile, files?: FormFile[], jahiaServer?: JahiaServer): Chainable<any>
+            runProvisioningScript(script: FormFile | StringDictionary[], files?: FormFile[], jahiaServer?: JahiaServer): Chainable<any>
         }
     }
 }
 
-type FormFile = {
+export type StringDictionary = { [key: string]: string }
+
+export type FormFile = {
     fileName?: string,
     fileContent?: string,
     type?: string,
     encoding?: Cypress.Encodings
-    replacements?: { [key: string]: string }
+    replacements?: StringDictionary
 }
 
-type JahiaServer = {
+export type JahiaServer = {
     url: string;
     username: string;
     password: string
@@ -40,7 +42,7 @@ function processContent(formFile: FormFile) {
 function append(formFile: FormFile, formData: FormData, key: string) {
     if (formFile.fileContent) {
         formData.append(key, processContent(formFile), formFile.fileName);
-    } else {
+    } else if (formFile.fileName) {
         cy.fixture(formFile.fileName, (formFile.encoding ? formFile.encoding : 'binary')).then(content => {
             if (typeof content === 'object') {
                 formFile.fileContent = JSON.stringify(content);
@@ -58,10 +60,22 @@ const serverDefaults: JahiaServer = {
     password: Cypress.env('SUPER_USER_PASSWORD')
 }
 
-export const runProvisioningScript = (script: FormFile, files?: FormFile[], jahiaServer: JahiaServer = serverDefaults, options: Cypress.Loggable = {log:true}): void => {
+function isFormFile(script: FormFile | StringDictionary[]): script is FormFile {
+    return Boolean((script as FormFile).fileContent || (script as FormFile).fileName);
+}
+
+export const runProvisioningScript = (script: FormFile | StringDictionary[], files?: FormFile[], jahiaServer: JahiaServer = serverDefaults, options: Cypress.Loggable = {log:true}): void => {
     const formData = new FormData()
 
-    append(script, formData, "script")
+    if (isFormFile(script)) {
+        append(script, formData, "script")
+    } else {
+        append({
+            fileContent: JSON.stringify(script),
+            type: 'application/json'
+        }, formData, "script");
+    }
+
     if (files) {
         files.forEach((f) => {
             append(f, formData, "file")
@@ -77,7 +91,7 @@ export const runProvisioningScript = (script: FormFile, files?: FormFile[], jahi
             autoEnd: false,
             name: 'runProvisioningScript',
             displayName: 'provScript',
-            message: `Run ${script.fileName ? script.fileName : 'inline script'}`,
+            message: `Run ${isFormFile(script) && script.fileName ? script.fileName : 'inline script'} towards server: ${jahiaServer.url}`,
             consoleProps: () => {
                 return {
                     Script: script,

package/src/support/registerSupport.ts

@@ -1,5 +1,5 @@
 import {apollo, apolloClient} from "./apollo"
-import {executeGroovy, runProvisioningScript} from "./provisioning"
+import {executeGroovy, runProvisioningScript, installBundle} from "./provisioning"
 import {login} from "./login"
 import {logout} from "./logout"
 import installLogsCollector from 'cypress-terminal-report/src/installLogsCollector'
@@ -12,6 +12,7 @@ export const registerSupport = (): void => {
 
     Cypress.Commands.add('runProvisioningScript', runProvisioningScript)
     Cypress.Commands.add('executeGroovy', executeGroovy)
+    Cypress.Commands.add('installBundle', installBundle)
 
     Cypress.Commands.add('login', login)
     Cypress.Commands.add('logout', logout)
@@ -20,4 +21,4 @@ export const registerSupport = (): void => {
     Cypress.Commands.overwrite('fixture', fixture)
 
     installLogsCollector()
-}
+}

package/src/support/repeatUntil.ts

@@ -3,7 +3,7 @@
 // Load type definitions that come with Cypress module
 /// <reference types="cypress" />
 
-type RepeatUntilOptions = {
+export type RepeatUntilOptions = {
     attempts: number,
     callback: () => void,
     delay: number,

package/.eslintignore

@@ -1 +0,0 @@
-node_modules

package/.eslintrc.json

@@ -1,11 +0,0 @@
-{
-    "plugins": [
-        "@typescript-eslint",
-        "cypress"
-    ],
-    "extends": [
-        "plugin:cypress/recommended",
-        "plugin:@typescript-eslint/recommended"
-    ],
-    "root": true
-}

package/.graphqlconfig

@@ -1,16 +0,0 @@
-{
-  "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
-      }
-    }
-  }
-}