@jahia/cypress 1.1.5 → 2.0.0

package/README.md

@@ -82,9 +82,8 @@ Add typings in your tsconfig.json :
 ```
 
 This project provides a plugin for settings environment variable based on system env ( `JAHIA_URL` and `SUPER_USER_PASSWORD` )
-It also embeds `cypress-terminal-report` for better output.
 
-To set-up : in `plugins/index.js`, calls the module in `@jahia/cypress/dist/plugins/registerPlugins` :
+Set up your plugins: in `plugins/index.js`, calls the module in `@jahia/cypress/dist/plugins/registerPlugins` :
 
 ```js
 module.exports = (on, config) => {

package/dist/plugins/registerPlugins.js

@@ -5,9 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 exports.registerPlugins = void 0;
 var env_1 = __importDefault(require("./env"));
-var installLogsPrinter_1 = __importDefault(require("cypress-terminal-report/src/installLogsPrinter"));
 var registerPlugins = function (on, config) {
     env_1["default"](on, config);
-    installLogsPrinter_1["default"](on);
 };
 exports.registerPlugins = registerPlugins;

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/registerSupport.js

@@ -1,14 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 exports.__esModule = true;
 exports.registerSupport = void 0;
 var apollo_1 = require("./apollo");
 var provisioning_1 = require("./provisioning");
 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 () {
@@ -21,6 +17,5 @@ var registerSupport = function () {
     Cypress.Commands.add('logout', logout_1.logout);
     Cypress.Commands.add('repeatUntil', repeatUntil_1.repeatUntil);
     Cypress.Commands.overwrite('fixture', fixture_1.fixture);
-    installLogsCollector_1["default"]();
 };
 exports.registerSupport = registerSupport;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/cypress",
-  "version": "1.1.5",
+  "version": "2.0.0",
   "scripts": {
     "build": "tsc",
     "lint": "eslint src -c .eslintrc.json --ext .ts"
@@ -11,14 +11,14 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^4.29.3",
     "@typescript-eslint/parser": "^4.29.3",
-    "cypress": "^8.3.1",
+    "cypress": "^12.2.0",
     "eslint": "^7.32.0",
     "eslint-plugin-cypress": "^2.11.3",
+    "cross-fetch": "^3.1.5",
     "typescript": "^4.3.5"
   },
   "dependencies": {
     "@apollo/client": "^3.4.9",
-    "cypress-terminal-report": "^3.4.2",
     "graphql": "^15.5.0",
     "graphql-tag": "^2.11.0"
   }

package/src/plugins/registerPlugins.ts

@@ -1,7 +1,5 @@
 import env from "./env"
-import installLogsPrinter from 'cypress-terminal-report/src/installLogsPrinter'
 
 export const registerPlugins = (on: Cypress.PluginEvents, config: Cypress.PluginConfigOptions): void => {
     env(on, config)
-    installLogsPrinter(on)
 }

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/registerSupport.ts

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