From 00b17ff009fdda173adaae96402303c6a05d1abf Mon Sep 17 00:00:00 2001 From: Kostiantyn Miakshyn Date: Sat, 4 Jan 2025 13:45:56 +0100 Subject: [PATCH] Slugify Collectives and Pages (try fix cypress) Signed-off-by: Kostiantyn Miakshyn --- cypress/e2e/pages-links.spec.js | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/cypress/e2e/pages-links.spec.js b/cypress/e2e/pages-links.spec.js index c79d855b8..4cf48647f 100644 --- a/cypress/e2e/pages-links.spec.js +++ b/cypress/e2e/pages-links.spec.js @@ -124,9 +124,8 @@ describe('Page link handling', function() { cy.url().then((newBaseUrl) => { const url = new URL(href, newBaseUrl) - const encodedCollectiveName = encodeURIComponent('Link Testing') const pathname = isPublic - ? url.pathname.replace(`/${encodedCollectiveName}`, `/p/\\w+/${encodedCollectiveName}`) + ? url.pathname.replace(`/Link-Testing`, `/p/\\w+/Link-Testing`) : url.pathname cy.location().should((loc) => { expect(loc.pathname).to.match(new RegExp(`^${expectedPathname || pathname}$`)) @@ -268,7 +267,7 @@ describe('Page link handling', function() { // const href = `./Link%20Target?fileId=${linkTargetPageId}` const href = `/index.php/apps/files/?dir=/&openfile=${linkTargetPageId}#relPath=./Link%20Target` testLinkToSameTab(href, { - expectedPathname: '/index.php/apps/collectives/Link%20Testing/Link%20Target', + expectedPathname: '/index.php/apps/collectives/Link-Testing-4/page-70-Link-Target', expectedSearch: `?fileId=${linkTargetPageId}`, }) } @@ -278,7 +277,7 @@ describe('Page link handling', function() { if (!['stable27', 'stable28'].includes(Cypress.env('ncVersion'))) { const href = `./Link%20Target%20Outdated?fileId=${linkTargetPageId}` testLinkToSameTab(href, { - expectedPathname: '/index.php/apps/collectives/Link%20Testing/Link%20Target', + expectedPathname: '/index.php/apps/collectives/Link-Testing-4/page-70-Link-Target', expectedSearch: `?fileId=${linkTargetPageId}`, }) } else { @@ -286,7 +285,7 @@ describe('Page link handling', function() { // const href = `./Link%20Target%20Outdated?fileId=${linkTargetPageId}` const href = `/index.php/apps/files/?dir=/&openfile=${linkTargetPageId}#relPath=./Link%20Target%20Outdated` testLinkToSameTab(href, { - expectedPathname: '/index.php/apps/collectives/Link%20Testing/Link%20Target', + expectedPathname: '/index.php/apps/collectives/Link-Testing-4/page-70-Link-Target', expectedSearch: `?fileId=${linkTargetPageId}`, }) } @@ -295,7 +294,7 @@ describe('Page link handling', function() { const href = './Link%20Target' if (!['stable27', 'stable28'].includes(Cypress.env('ncVersion'))) { testLinkToSameTab(href, { - expectedPathname: '/index.php/apps/collectives/Link%20Testing/Link%20Target', + expectedPathname: '/index.php/apps/collectives/Link-Testing-4/page-70-Link-Target', expectedSearch: `?fileId=${linkTargetPageId}`, }) } else { @@ -307,11 +306,11 @@ describe('Page link handling', function() { const href = './Link%20Target.md' if (!['stable27', 'stable28'].includes(Cypress.env('ncVersion'))) { testLinkToSameTab(href, { - expectedPathname: '/index.php/apps/collectives/Link%20Testing/Link%20Target', + expectedPathname: '/index.php/apps/collectives/Link-Testing-4/page-70-Link-Target', expectedSearch: `?fileId=${linkTargetPageId}`, }) } else { - testLinkToSameTab(href, { expectedPathname: '/index.php/apps/collectives/Link%20Testing/Link%20Target' }) + testLinkToSameTab(href, { expectedPathname: '/index.php/apps/collectives/Link-Testing-4/page-70-Link-Target' }) } }) @@ -337,7 +336,7 @@ describe('Page link handling', function() { // const href = `../Link%20Target.md?fileId=${linkTargetPageId}` const href = `/index.php/apps/files/?dir=&openfile=${linkTargetPageId}#relPath=../Link%20Target.md` testLinkToSameTab(href, { - expectedPathname: '/index.php/apps/collectives/Link%20Testing/Link%20Target', + expectedPathname: '/index.php/apps/collectives/Link-Testing-4/page-70-Link-Target', expectedSearch: `?fileId=${linkTargetPageId}`, }) } @@ -350,7 +349,7 @@ describe('Page link handling', function() { // const href = `./Link%20Target?fileId=${linkTargetPageId}` const href = `/index.php/apps/files/?dir=/&openfile=${linkTargetPageId}#relPath=./Link%20Target` testLinkToSameTab(href, { - expectedPathname: '/index.php/apps/collectives/Link%20Testing/Link%20Target', + expectedPathname: '/index.php/apps/collectives/Link-Testing-4/page-70-Link-Target', expectedSearch: `?fileId=${linkTargetPageId}`, }) } @@ -359,7 +358,7 @@ describe('Page link handling', function() { describe('Link handling to collectives in edit mode', function() { it('Opens link with URL to page in this collective in same tab', function() { - const href = `${baseUrl}/index.php/apps/collectives/Link%20Testing/Link%20Target` + const href = `${baseUrl}/index.php/apps/collectives/Link-Testing-4/page-70-Link-Target` cy.switchToEditMode() // Starting with Nextcloud 29, internal links will always open in same tab (also in edit mode) if (!['stable27', 'stable28'].includes(Cypress.env('ncVersion'))) { @@ -372,7 +371,7 @@ describe('Page link handling', function() { } }) it('Opens link with absolute path to page in this collective in same tab', function() { - const href = '/index.php/apps/collectives/Link%20Testing/Link%20Target' + const href = '/index.php/apps/collectives/Link-Testing-4/page-70-Link-Target' cy.switchToEditMode() // Starting with Nextcloud 29, internal links will always open in same tab (also in edit mode) if (!['stable27', 'stable28'].includes(Cypress.env('ncVersion'))) { @@ -401,7 +400,7 @@ describe('Page link handling', function() { if (!['stable27', 'stable28'].includes(Cypress.env('ncVersion'))) { testLinkToSameTab(href, { edit: true, - expectedPathname: '/index.php/apps/collectives/Link%20Testing/Link%20Target', + expectedPathname: '/index.php/apps/collectives/Link-Testing-4/page-70-Link-Target', expectedSearch: `?fileId=${linkTargetPageId}`, }) } else { @@ -429,7 +428,7 @@ describe('Page link handling', function() { if (!['stable27', 'stable28'].includes(Cypress.env('ncVersion'))) { testLinkToSameTab(href, { edit: true, - expectedPathname: '/index.php/apps/collectives/Link%20Testing/Link%20Target', + expectedPathname: '/index.php/apps/collectives/Link-Testing-4/page-70-Link-Target', expectedSearch: `?fileId=${linkTargetPageId}`, }) } else { @@ -552,13 +551,13 @@ describe('Page link handling', function() { it('Public share in view mode: opens link with absolute path to page in this collective in same tab', function() { cy.logout() cy.visit(`${shareUrl}/Link Source`) - const href = '/index.php/apps/collectives/Link%20Testing/Link%20Target' + const href = '/index.php/apps/collectives/Link-Testing-4/page-70-Link-Target' testLinkToSameTab(href, { isPublic: true }) }) it('Public share in edit mode: opens link with absolute path to page in this collective in same tab', function() { cy.logout() cy.visit(`${shareUrl}/Link Source`) - const href = '/index.php/apps/collectives/Link%20Testing/Link%20Target' + const href = '/index.php/apps/collectives/Link-Testing-4/page-70-Link-Target' cy.switchToEditMode() if (!['stable27', 'stable28'].includes(Cypress.env('ncVersion'))) { testLinkToSameTab(href, { edit: true, isPublic: true })