@jahia/cypress 3.21.0 → 3.21.2

package/dist/support/apollo/apolloClient.js

@@ -4,18 +4,18 @@ exports.apolloClient = exports.switchApolloClient = void 0;
 var core_1 = require("@apollo/client/core");
 var links_1 = require("./links");
 var switchApolloClient = function (config, options) {
-    if (config === void 0) { config = { url: Cypress.config().baseUrl }; }
+    if (config === void 0) { config = {}; }
     if (options === void 0) { options = {
         log: true,
         setCurrentApolloClient: true
     }; }
     // Switch context to apollo client
-    cy.visit(config.url, { failOnStatusCode: false });
+    cy.visit(config.url || Cypress.config().baseUrl, { failOnStatusCode: false });
     return exports.apolloClient(config, options);
 };
 exports.switchApolloClient = switchApolloClient;
 var apolloClient = function (config, options) {
-    if (config === void 0) { config = { url: Cypress.config().baseUrl }; }
+    if (config === void 0) { config = {}; }
     if (options === void 0) { options = {
         log: true,
         setCurrentApolloClient: true
@@ -30,7 +30,7 @@ var apolloClient = function (config, options) {
     else {
         headers.authorization = "Basic " + btoa('root:' + Cypress.env('SUPER_USER_PASSWORD'));
     }
-    var links = [links_1.uploadLink, links_1.formDataHttpLink(config.url, headers)];
+    var links = [links_1.uploadLink, links_1.formDataHttpLink(config.url || Cypress.config().baseUrl, headers)];
     var client = new core_1.ApolloClient({
         link: core_1.from(links),
         cache: new core_1.InMemoryCache(),

package/dist/support/login.d.ts

@@ -2,10 +2,10 @@
 declare global {
     namespace Cypress {
         interface Chainable<Subject> {
-            login(username?: string, password?: string): Chainable<Cypress.Response<any>>;
-            loginAndStoreSession(username?: string, password?: string): Chainable<Cypress.Response<any>>;
+            login(username?: string, password?: string, url?: string): Chainable<Cypress.Response<any>>;
+            loginAndStoreSession(username?: string, password?: string, url?: string): Chainable<Cypress.Response<any>>;
         }
     }
 }
 export declare const login: (username?: string, password?: string, url?: string) => void;
-export declare const loginAndStoreSession: (username?: string, password?: string) => void;
+export declare const loginAndStoreSession: (username?: string, password?: string, url?: string) => void;

package/dist/support/login.js

@@ -28,14 +28,15 @@ var login = function (username, password, url) {
     });
 };
 exports.login = login;
-var loginAndStoreSession = function (username, password) {
+var loginAndStoreSession = function (username, password, url) {
     if (username === void 0) { username = 'root'; }
     if (password === void 0) { password = Cypress.env('SUPER_USER_PASSWORD'); }
+    if (url === void 0) { url = '/start'; }
     cy.session('session-' + username, function () {
         cy.login(username, password); // Edit in chief
     }, {
         validate: function () {
-            cy.request('/start').its('status').should('eq', 200);
+            cy.request(url).its('status').should('eq', 200);
         }
     });
 };

package/package.json

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

package/src/support/apollo/apolloClient.ts

@@ -22,16 +22,16 @@ export type ApolloClientOptions = Cypress.Loggable & {
     setCurrentApolloClient: boolean
 }
 
-export const switchApolloClient = function (config: HostConfig = {url: Cypress.config().baseUrl}, options: ApolloClientOptions = {
+export const switchApolloClient = function (config: HostConfig = {}, options: ApolloClientOptions = {
     log: true,
     setCurrentApolloClient: true
 }): void {
     // Switch context to apollo client
-    cy.visit(config.url, {failOnStatusCode: false});
+    cy.visit(config.url || Cypress.config().baseUrl, {failOnStatusCode: false});
     return apolloClient(config, options);
 };
 
-export const apolloClient = function (config: HostConfig = {url: Cypress.config().baseUrl}, options: ApolloClientOptions = {
+export const apolloClient = function (config: HostConfig = {}, options: ApolloClientOptions = {
     log: true,
     setCurrentApolloClient: true
 }): void {
@@ -44,7 +44,7 @@ export const apolloClient = function (config: HostConfig = {url: Cypress.config(
         headers.authorization = `Basic ${btoa('root:' + Cypress.env('SUPER_USER_PASSWORD'))}`;
     }
 
-    const links = [uploadLink, formDataHttpLink(config.url, headers)];
+    const links = [uploadLink, formDataHttpLink(config.url || Cypress.config().baseUrl, headers)];
 
     const client = new ApolloClient({
         link: from(links),

package/src/support/login.ts

@@ -7,8 +7,8 @@ declare global {
     namespace Cypress {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         interface Chainable<Subject> {
-            login(username?: string, password?: string): Chainable<Cypress.Response<any>>
-            loginAndStoreSession(username?: string, password?: string): Chainable<Cypress.Response<any>>
+            login(username?: string, password?: string, url?: string): Chainable<Cypress.Response<any>>
+            loginAndStoreSession(username?: string, password?: string, url?: string): Chainable<Cypress.Response<any>>
         }
     }
 }
@@ -36,12 +36,12 @@ export const login = (username = 'root', password: string = Cypress.env('SUPER_U
     });
 };
 
-export const loginAndStoreSession = (username = 'root', password: string = Cypress.env('SUPER_USER_PASSWORD')): void => {
+export const loginAndStoreSession = (username = 'root', password: string = Cypress.env('SUPER_USER_PASSWORD'), url = '/start'): void => {
     cy.session('session-' + username, () => {
         cy.login(username, password); // Edit in chief
     }, {
         validate() {
-            cy.request('/start').its('status').should('eq', 200);
+            cy.request(url).its('status').should('eq', 200);
         }
     });
 };