@jahia/cypress 1.1.4 → 1.1.6

package/dist/support/apollo/apollo.js

@@ -43,24 +43,25 @@ var apollo = function (apollo, options) {
     }
     var result;
     var logger;
+    var optionsWithDefaultCache = __assign({ fetchPolicy: "no-cache" }, options);
     if (!apollo) {
-        cy.apolloClient().apollo(options);
+        cy.apolloClient().apollo(optionsWithDefaultCache);
     }
     else {
-        if (isQueryFile(options)) {
-            var queryFile = options.queryFile, apolloOptions_1 = __rest(options, ["queryFile"]);
+        if (isQueryFile(optionsWithDefaultCache)) {
+            var queryFile = optionsWithDefaultCache.queryFile, apolloOptions_1 = __rest(optionsWithDefaultCache, ["queryFile"]);
             cy.fixture(queryFile).then(function (content) {
                 cy.apollo(__assign({ query: graphql_tag_1["default"](content) }, apolloOptions_1));
             });
         }
-        else if (isMutationFile(options)) {
-            var mutationFile = options.mutationFile, apolloOptions_2 = __rest(options, ["mutationFile"]);
+        else if (isMutationFile(optionsWithDefaultCache)) {
+            var mutationFile = optionsWithDefaultCache.mutationFile, apolloOptions_2 = __rest(optionsWithDefaultCache, ["mutationFile"]);
             cy.fixture(mutationFile).then(function (content) {
                 cy.apollo(__assign({ mutation: graphql_tag_1["default"](content) }, apolloOptions_2));
             });
         }
         else {
-            var _a = options.log, log = _a === void 0 ? true : _a, apolloOptions_3 = __rest(options, ["log"]);
+            var _a = optionsWithDefaultCache.log, log = _a === void 0 ? true : _a, apolloOptions_3 = __rest(optionsWithDefaultCache, ["log"]);
             if (log) {
                 logger = Cypress.log({
                     autoEnd: false,
@@ -76,7 +77,13 @@ var apollo = function (apollo, options) {
                 });
             }
             cy.wrap({}, { log: false })
-                .then(function () { return (isQuery(options) ? apollo.query(options) : apollo.mutate(options))
+                .then(function () { return (isQuery(optionsWithDefaultCache) ? apollo.query(optionsWithDefaultCache)["catch"](function (error) {
+                cy.log("Caught Graphql Query Error: " + JSON.stringify(error));
+                return error;
+            }) : apollo.mutate(optionsWithDefaultCache)["catch"](function (error) {
+                cy.log("Caught Graphql Mutation Error: " + JSON.stringify(error));
+                return error;
+            }))
                 .then(function (r) {
                 result = r;
                 logger === null || logger === void 0 ? void 0 : logger.end();

package/dist/support/apollo/apolloClient.js

@@ -3,6 +3,7 @@
 exports.__esModule = true;
 exports.apolloClient = void 0;
 var core_1 = require("@apollo/client/core");
+var links_1 = require("./links");
 var apolloClient = function (authMethod, options) {
     if (options === void 0) { options = {
         log: true,
@@ -18,11 +19,9 @@ var apolloClient = function (authMethod, options) {
     else if (authMethod.username !== undefined && authMethod.password !== undefined) {
         headers.authorization = "Basic " + btoa(authMethod.username + ':' + authMethod.password);
     }
+    var links = [links_1.uploadLink, links_1.FormDataHttpLink(Cypress.config().baseUrl, headers)];
     var client = new core_1.ApolloClient({
-        link: new core_1.HttpLink({
-            uri: Cypress.config().baseUrl + "/modules/graphql",
-            headers: headers
-        }),
+        link: core_1.from(links),
         cache: new core_1.InMemoryCache(),
         defaultOptions: {
             query: {

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

@@ -0,0 +1,3 @@
+import { HttpLink } from '@apollo/client/link/http';
+export declare const FormDataHttpLink: (baseUrl: string, headers: Object) => HttpLink;
+export declare const uploadLink: import("@apollo/client/core").ApolloLink;

package/dist/support/apollo/links.js

@@ -0,0 +1,73 @@
+"use strict";
+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);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+exports.__esModule = true;
+exports.uploadLink = exports.FormDataHttpLink = void 0;
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+var http_1 = require("@apollo/client/link/http");
+var cross_fetch_1 = __importDefault(require("cross-fetch"));
+var context_1 = require("@apollo/client/link/context");
+var FormDataHttpLink = function (baseUrl, headers) {
+    return new http_1.HttpLink({
+        uri: baseUrl + "/modules/graphql",
+        headers: headers,
+        fetch: function (uri, fetcherOptions) {
+            var options = __assign({}, fetcherOptions);
+            if (options.formData) {
+                var formData_1 = options.formData;
+                var body_1 = JSON.parse(options.body.toString());
+                if (Array.isArray(body_1)) {
+                    formData_1.append('query', options.body.toString());
+                }
+                else {
+                    Object.keys(body_1).forEach(function (k) {
+                        return formData_1.append(k, typeof body_1[k] === 'string' ? body_1[k] : JSON.stringify(body_1[k]));
+                    });
+                }
+                fetcherOptions.body = formData_1;
+                delete fetcherOptions.headers['content-type'];
+                return cross_fetch_1["default"](uri, fetcherOptions);
+            }
+            return cross_fetch_1["default"](uri, fetcherOptions);
+        }
+    });
+};
+exports.FormDataHttpLink = FormDataHttpLink;
+exports.uploadLink = context_1.setContext(function (operation, _a) {
+    var fetchOptions = _a.fetchOptions;
+    var variables = operation.variables;
+    var fileFound = false;
+    var formData = new FormData();
+    var id = Math.random().toString(36);
+    // Search for File objects on the request and set it as formData
+    Object.keys(variables).forEach(function (k) {
+        var variable = variables[k];
+        if (variable instanceof File) {
+            formData.append(id, variable);
+            variables[k] = id;
+            fileFound = true;
+        }
+    });
+    if (fileFound) {
+        return {
+            fetchOptions: __assign(__assign({}, fetchOptions), { formData: formData })
+        };
+    }
+    else {
+        return {
+            fetchOptions: __assign({}, fetchOptions)
+        };
+    }
+});

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

@@ -21,4 +21,4 @@ export declare type JahiaServer = {
     username: string;
     password: string;
 };
-export declare const runProvisioningScript: (script: FormFile | StringDictionary[], files?: FormFile[], jahiaServer?: JahiaServer, options?: Cypress.Loggable) => void;
+export declare const runProvisioningScript: (script: FormFile | StringDictionary[], files?: FormFile[], jahiaServer?: JahiaServer, options?: Cypress.Loggable, timeout?: number) => void;

package/dist/support/provisioning/runProvisioningScript.js

@@ -1,8 +1,6 @@
 "use strict";
-/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-namespace */
 exports.__esModule = true;
 exports.runProvisioningScript = void 0;
-/// <reference types="cypress" />
 function processContent(formFile) {
     var content = formFile.fileContent;
     if (formFile.replacements) {
@@ -35,7 +33,7 @@ var serverDefaults = {
 function isFormFile(script) {
     return Boolean(script.fileContent || script.fileName);
 }
-var runProvisioningScript = function (script, files, jahiaServer, options) {
+var runProvisioningScript = function (script, files, jahiaServer, options, timeout) {
     if (jahiaServer === void 0) { jahiaServer = serverDefaults; }
     if (options === void 0) { options = { log: true }; }
     var formData = new FormData();
@@ -72,7 +70,7 @@ var runProvisioningScript = function (script, files, jahiaServer, options) {
             }
         });
     }
-    cy.request({
+    var request = {
         url: jahiaServer.url + "/modules/api/provisioning",
         method: 'POST',
         auth: {
@@ -82,7 +80,11 @@ var runProvisioningScript = function (script, files, jahiaServer, options) {
         },
         body: formData,
         log: false
-    }).then(function (res) {
+    };
+    if (typeof timeout !== 'undefined') {
+        request.timeout = timeout;
+    }
+    cy.request(request).then(function (res) {
         response = res;
         expect(res.status, 'Script result').to.eq(200);
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/cypress",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "scripts": {
     "build": "tsc",
     "lint": "eslint src -c .eslintrc.json --ext .ts"
@@ -14,6 +14,7 @@
     "cypress": "^8.3.1",
     "eslint": "^7.32.0",
     "eslint-plugin-cypress": "^2.11.3",
+    "cross-fetch": "^3.1.5",
     "typescript": "^4.3.5"
   },
   "dependencies": {

package/src/support/apollo/apollo.ts

@@ -38,22 +38,23 @@ export const apollo = function (apollo: ApolloClient<any>, options: ApolloOption
 
     let result : ApolloQueryResult<any> | FetchResult
     let logger : Cypress.Log
+    const optionsWithDefaultCache: ApolloOptions = {fetchPolicy: "no-cache", ...options}
 
     if (!apollo) {
-        cy.apolloClient().apollo(options)
+        cy.apolloClient().apollo(optionsWithDefaultCache)
     } else {
-        if (isQueryFile(options)) {
-            const {queryFile, ...apolloOptions} = options
+        if (isQueryFile(optionsWithDefaultCache)) {
+            const {queryFile, ...apolloOptions} = optionsWithDefaultCache
             cy.fixture(queryFile).then(content => {
                 cy.apollo({query: gql(content), ...apolloOptions})
             })
-        } else if (isMutationFile(options)) {
-            const {mutationFile, ...apolloOptions} = options
+        } else if (isMutationFile(optionsWithDefaultCache)) {
+            const {mutationFile, ...apolloOptions} = optionsWithDefaultCache
             cy.fixture(mutationFile).then(content => {
                 cy.apollo({mutation: gql(content), ...apolloOptions})
             })
         } else {
-            const {log = true, ...apolloOptions} = options
+            const {log = true, ...apolloOptions} = optionsWithDefaultCache
             if (log) {
                 logger = Cypress.log({
                     autoEnd: false,
@@ -70,7 +71,13 @@ export const apollo = function (apollo: ApolloClient<any>, options: ApolloOption
             }
 
             cy.wrap({}, {log: false})
-                .then(() => (isQuery(options) ? apollo.query(options) : apollo.mutate(options))
+                .then(() => (isQuery(optionsWithDefaultCache) ? apollo.query(optionsWithDefaultCache).catch(error => {
+                        cy.log(`Caught Graphql Query Error: ${JSON.stringify(error)}`);
+                        return error;
+                    }) : apollo.mutate(optionsWithDefaultCache).catch(error => {
+                        cy.log(`Caught Graphql Mutation Error: ${JSON.stringify(error)}`);
+                        return error;
+                    }))
                     .then(r => {
                         result = r
                         logger?.end()

package/src/support/apollo/apolloClient.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-namespace */
 
-import {ApolloClient, HttpLink, InMemoryCache, NormalizedCacheObject} from '@apollo/client/core'
+import {ApolloClient, from, HttpLink, InMemoryCache, NormalizedCacheObject} from '@apollo/client/core'
+import {FormDataHttpLink, uploadLink} from './links'
 
 interface AuthMethod {
     token?: string
@@ -34,11 +35,10 @@ export const apolloClient = function (authMethod?: AuthMethod, options: ApolloCl
         headers.authorization = `Basic ${btoa(authMethod.username + ':' + authMethod.password)}`
     }
 
+    const links = [ uploadLink, FormDataHttpLink(Cypress.config().baseUrl, headers)]
+
     const client = new ApolloClient({
-        link: new HttpLink({
-            uri: `${Cypress.config().baseUrl}/modules/graphql`,
-            headers,
-        }),
+        link: from(links),
         cache: new InMemoryCache(),
         defaultOptions: {
             query: {

package/src/support/apollo/links.ts

@@ -0,0 +1,64 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import { HttpLink } from '@apollo/client/link/http'
+import fetch from 'cross-fetch'
+import { setContext } from '@apollo/client/link/context'
+
+interface ApolloRequestInit extends RequestInit {
+    formData?: FormData
+}
+
+export const FormDataHttpLink = (baseUrl: string, headers: Object) => {
+    return new HttpLink({
+        uri: `${baseUrl}/modules/graphql`,
+        headers,
+        fetch: (uri, fetcherOptions) => {
+            const options: ApolloRequestInit = { ...fetcherOptions }
+            if (options.formData) {
+                const formData = options.formData
+                const body = JSON.parse(options.body.toString())
+                if (Array.isArray(body)) {
+                    formData.append('query', options.body.toString())
+                } else {
+                    Object.keys(body).forEach((k) =>
+                        formData.append(k, typeof body[k] === 'string' ? body[k] : JSON.stringify(body[k])),
+                    )
+                }
+
+                fetcherOptions.body = formData
+                delete fetcherOptions.headers['content-type']
+                return fetch(uri, fetcherOptions)
+            }
+            return fetch(uri, fetcherOptions)
+        },
+    })
+}
+
+export const uploadLink = setContext((operation, { fetchOptions }) => {
+    const { variables } = operation
+    let fileFound = false
+    const formData = new FormData()
+    const id = Math.random().toString(36)
+    // Search for File objects on the request and set it as formData
+    Object.keys(variables).forEach(function (k) {
+        const variable = variables[k]
+        if (variable instanceof File) {
+            formData.append(id, variable)
+            variables[k] = id
+            fileFound = true
+        }
+    })
+    if (fileFound) {
+        return {
+            fetchOptions: {
+                ...fetchOptions,
+                formData: formData,
+            },
+        }
+    } else {
+        return {
+            fetchOptions: {
+                ...fetchOptions,
+            },
+        }
+    }
+})

package/src/support/provisioning/runProvisioningScript.ts

@@ -1,4 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-namespace */
+import RequestOptions = Cypress.RequestOptions;
+
 
 // Load type definitions that come with Cypress module
 /// <reference types="cypress" />
@@ -64,7 +66,7 @@ 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 => {
+export const runProvisioningScript = (script: FormFile | StringDictionary[], files?: FormFile[], jahiaServer: JahiaServer = serverDefaults, options: Cypress.Loggable = {log:true}, timeout?: number): void => {
     const formData = new FormData()
 
     if (isFormFile(script)) {
@@ -103,7 +105,7 @@ export const runProvisioningScript = (script: FormFile | StringDictionary[], fil
         })
     }
 
-    cy.request({
+    const request: Partial<RequestOptions> = {
         url: `${jahiaServer.url}/modules/api/provisioning`,
         method: 'POST',
         auth: {
@@ -113,7 +115,13 @@ export const runProvisioningScript = (script: FormFile | StringDictionary[], fil
         },
         body: formData,
         log: false
-    }).then(res => {
+    }
+
+    if(typeof timeout !== 'undefined'){
+        request.timeout = timeout
+    }
+
+    cy.request(request).then(res => {
         response = res
         expect(res.status, 'Script result').to.eq(200)
         try {