IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-23 01:16:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

export getBaseUrl

Browse Source
This commit is contained in:
Ashley Harrison 2021-12-15 16:01:42 +00:00
parent 5a0dd3cca0
commit ae7eecea37
No known key found for this signature in database
GPG Key ID: AEC29E54E8D7CD90
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/grafana-e2e/src/flows/login.ts
View File

@ -1,5 +1,5 @@
import { e2e } from '../index'; import { e2e } from '../index';
import { fromBaseUrl } from '../support/url'; import { getBaseUrl } from '../support/url';
const DEFAULT_USERNAME = 'admin'; const DEFAULT_USERNAME = 'admin';
const DEFAULT_PASSWORD = 'admin'; const DEFAULT_PASSWORD = 'admin';
@ -8,7 +8,7 @@ export const login = (username = DEFAULT_USERNAME, password = DEFAULT_PASSWORD,
if (loginViaApi) { if (loginViaApi) {
cy.request({ cy.request({
method: 'POST', method: 'POST',
url: fromBaseUrl('/login'), url: `${getBaseUrl}/login`,
body: { body: {
user: username, user: username,
password, password,

2
packages/grafana-e2e/src/support/url.ts
View File

@ -1,6 +1,6 @@
import { e2e } from '../index'; 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; export const fromBaseUrl = (url = '') => new URL(url, getBaseUrl()).href;