From d58b41301a1c27dbf97c421c0f3aa86ea40918e8 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Fri, 24 Nov 2023 00:57:55 +0100 Subject: [PATCH] fix(cypress): Adjust cypress tests that relied on version to be 28 Signed-off-by: Ferdinand Thiessen --- cypress/e2e/theming/navigation-bar-settings.cy.ts | 1 + cypress/support/commonUtils.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cypress/e2e/theming/navigation-bar-settings.cy.ts b/cypress/e2e/theming/navigation-bar-settings.cy.ts index b15b70b0e0f..3d92518c4bd 100644 --- a/cypress/e2e/theming/navigation-bar-settings.cy.ts +++ b/cypress/e2e/theming/navigation-bar-settings.cy.ts @@ -89,6 +89,7 @@ describe('Admin theming set default apps', () => { }) it('See the default app is changed back to default', () => { + cy.reload() cy.get('#nextcloud').click() cy.url().should('match', /apps\/dashboard/) }) diff --git a/cypress/support/commonUtils.ts b/cypress/support/commonUtils.ts index 580e9b23428..82c55c8e91e 100644 --- a/cypress/support/commonUtils.ts +++ b/cypress/support/commonUtils.ts @@ -45,7 +45,7 @@ export function installTestApp() { const version = output.stdout.match(/(\d\d+)\.\d+\.\d+/)?.[1] cy.wrap(version).should('not.be.undefined') cy.exec(`docker cp '${testAppPath}' nextcloud-cypress-tests-server:/var/www/html/apps`, { log: true }) - cy.exec(`docker exec nextcloud-cypress-tests-server sed -i 's|version="[0-9]+|version="${version}|' apps/testapp/appinfo/info.xml`) + cy.exec(`docker exec nextcloud-cypress-tests-server sed -i -e 's|-version="[0-9]\\+|-version="${version}|g' apps/testapp/appinfo/info.xml`) cy.runOccCommand('app:enable testapp') }) } -- 2.39.5