From ae7eecea37bbea6407bd45e6f8e87160925d5913 Mon Sep 17 00:00:00 2001 From: Ashley Harrison Date: Wed, 15 Dec 2021 16:01:42 +0000 Subject: [PATCH] export getBaseUrl --- packages/grafana-e2e/src/flows/login.ts | 4 ++-- packages/grafana-e2e/src/support/url.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/grafana-e2e/src/flows/login.ts b/packages/grafana-e2e/src/flows/login.ts index 01f0042ed15..8454a1bd4d9 100644 --- a/packages/grafana-e2e/src/flows/login.ts +++ b/packages/grafana-e2e/src/flows/login.ts @@ -1,5 +1,5 @@ import { e2e } from '../index'; -import { fromBaseUrl } from '../support/url'; +import { getBaseUrl } from '../support/url'; const DEFAULT_USERNAME = 'admin'; const DEFAULT_PASSWORD = 'admin'; @@ -8,7 +8,7 @@ export const login = (username = DEFAULT_USERNAME, password = DEFAULT_PASSWORD, if (loginViaApi) { cy.request({ method: 'POST', - url: fromBaseUrl('/login'), + url: `${getBaseUrl}/login`, body: { user: username, password, diff --git a/packages/grafana-e2e/src/support/url.ts b/packages/grafana-e2e/src/support/url.ts index 7af06d000ac..b88707e5735 100644 --- a/packages/grafana-e2e/src/support/url.ts +++ b/packages/grafana-e2e/src/support/url.ts @@ -1,6 +1,6 @@ import { e2e } from '../index'; -const getBaseUrl = () => e2e.env('BASE_URL') || e2e.config().baseUrl || 'http://localhost:3000'; +export const getBaseUrl = () => e2e.env('BASE_URL') || e2e.config().baseUrl || 'http://localhost:3000'; export const fromBaseUrl = (url = '') => new URL(url, getBaseUrl()).href;