From 67aebb382515faed19ce44f6715a89bea65372d4 Mon Sep 17 00:00:00 2001 From: schiwaa Date: Wed, 22 Jan 2025 18:53:00 +0100 Subject: [PATCH] use Cypress.browser.isHeaded instead of env to determine headed vs headless mode --- frontend-e2e/cypress/e2e/role_admin/homepage.cy.js | 2 +- frontend-e2e/cypress/e2e/role_admin/stemwebdialog.cy.js | 2 +- frontend-e2e/env.js | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/frontend-e2e/cypress/e2e/role_admin/homepage.cy.js b/frontend-e2e/cypress/e2e/role_admin/homepage.cy.js index 5a69f9f0..481c9c8f 100644 --- a/frontend-e2e/cypress/e2e/role_admin/homepage.cy.js +++ b/frontend-e2e/cypress/e2e/role_admin/homepage.cy.js @@ -105,7 +105,7 @@ describe('Assert that only one tradition is highlighted in the sidebar menu: \ }); describe('message console logs errors and successes', () => { - if (Cypress.env('CY_MODE') === 'headed') { + if (Cypress.browser.isHeaded) { it('passes', () => { // Login needed to add a stemma. Skip in headless mode for now. const stemma_added_marker = 'Stemma added'; const stemma_deleted_marker = 'Deleted'; diff --git a/frontend-e2e/cypress/e2e/role_admin/stemwebdialog.cy.js b/frontend-e2e/cypress/e2e/role_admin/stemwebdialog.cy.js index 8f48c084..391c0068 100644 --- a/frontend-e2e/cypress/e2e/role_admin/stemwebdialog.cy.js +++ b/frontend-e2e/cypress/e2e/role_admin/stemwebdialog.cy.js @@ -295,7 +295,7 @@ describe('stemma editor tools and svg work properly', () => { describe('stemma editing error feedback in message console works properly', () => { it('passes', () => { // needs login - // if (Cypress.env('CY_MODE') === 'headed') { // only log in if headed. dont run this test headless because it needs to be logged in // TODO: also for headless mode + // if (Cypress.browser.isHeaded) { // only log in if headed. dont run this test headless because it needs to be logged in // TODO: also for headless mode // TODO: when fitted also for healess mode, merge with previous test (partly duplicate) // cy.loginViaUi(admin); diff --git a/frontend-e2e/env.js b/frontend-e2e/env.js index dfa82916..4809bec2 100644 --- a/frontend-e2e/env.js +++ b/frontend-e2e/env.js @@ -22,10 +22,7 @@ const CY_STEMMAREST_ENDPOINT = 'http://localhost:8080/stemmarest'; /* 'http://127.0.0.1:8080/stemmarest'; */ -// const CY_MODE = process.env.CY_STEMMAWEB_FRONTEND_URL ? 'headless' : 'headed'; - module.exports = { - // CY_MODE, CY_STEMMAWEB_FRONTEND_URL, CY_STEMMAWEB_MIDDLEWARE_URL, CY_STEMMAREST_ENDPOINT