From 5a9805de10b6b97bbabf3d5c6c07606667c924e5 Mon Sep 17 00:00:00 2001 From: "Francois G." Date: Thu, 11 Jul 2024 12:24:32 +0200 Subject: [PATCH] Fixed an issue with providing auth values without URL --- package.json | 2 +- src/support/apollo/apolloClient.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f27b928..0f2f253 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@jahia/cypress", - "version": "3.21.1", + "version": "3.21.2", "scripts": { "build": "tsc", "lint": "eslint src -c .eslintrc.json --ext .ts" diff --git a/src/support/apollo/apolloClient.ts b/src/support/apollo/apolloClient.ts index 1a13dfe..b75f96f 100644 --- a/src/support/apollo/apolloClient.ts +++ b/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),