@jahia/cypress 1.1.3 → 1.1.5

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

@@ -25,7 +25,7 @@ var fixture = function (originalCommand, fixture) {
                 encoding = args[0];
             }
             try {
-                cy.readFile('./node_modules/@jahia/cypress/fixtures/' + fixture, encoding, { log: false, timeout: 0 });
+                cy.readFile('./node_modules/@jahia/cypress/fixtures/' + fixture, encoding, { log: false, timeout: 200 });
             }
             catch (e) {
                 console.log(e);

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.3",
+  "version": "1.1.5",
   "scripts": {
     "build": "tsc",
     "lint": "eslint src -c .eslintrc.json --ext .ts"

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

@@ -16,7 +16,7 @@ export const fixture = function(originalCommand: ((...args: any[]) => any), fixt
             }
 
             try {
-                cy.readFile('./node_modules/@jahia/cypress/fixtures/' + fixture, encoding, {log: false, timeout: 0})
+                cy.readFile('./node_modules/@jahia/cypress/fixtures/' + fixture, encoding, {log: false, timeout: 200})
             } catch (e) {
                 console.log(e)
             }

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 {

package/jahia-cypress.iml

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