Slugify Collectives and Pages (try fix cypress)

Signed-off-by: Kostiantyn Miakshyn <[email protected]>
nextcloud · Jan 4, 2025 · 3f6dcdc · 3f6dcdc
1 parent 893a5c8
commit 3f6dcdc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cypress/e2e/pages-links.spec.js b/cypress/e2e/pages-links.spec.js
@@ -4,8 +4,7 @@
  */
 
 const baseUrl = Cypress.env('baseUrl')
-const sourceUrl = new URL(`${baseUrl}/index.php/apps/collectives/Link%20Testing/Link%20Source`)
-let imageId, pdfId, textId
+let imageId, pdfId, textId, sourceUrl
 let anotherCollectiveFirstPageId, linkTargetPageId
 
 describe('Page link handling', function() {
@@ -21,7 +20,9 @@ describe('Page link handling', function() {
 			.seedPage('Link Target', '', 'Readme.md').then(({ pageId }) => {
 				linkTargetPageId = pageId
 			})
-			.seedPage('Link Source', '', 'Readme.md')
+			.seedPage('Link Source', '', 'Readme.md').then(({ collectiveId, pageId }) => {
+				sourceUrl = new URL(`${baseUrl}/index.php/apps/collectives/Link-Testing-${collectiveId}/page-${pageId}-Link-Source`)
+			})
 		cy.seedPageContent('Link%20Testing/Link%20Target.md', 'Some content')
 		cy.uploadFile('test.md', 'text/markdown').then((id) => {
 			textId = id

diff --git a/cypress/support/commands.js b/cypress/support/commands.js
@@ -314,7 +314,7 @@ Cypress.Commands.add('seedPage',
 				)
 			})
 			.its('data.data.id')
-			.then(pageId => ({ ...subject, pageId }))
+			.then(pageId => ({ ...subject, collectiveId: collectiveContext(subject).collectiveId, pageId }))
 	})
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -314,7 +314,7 @@ Cypress.Commands.add('seedPage', @@
     				)
     			})
     			.its('data.data.id')
-    			.then(pageId => ({ ...subject, pageId }))
+    			.then(pageId => ({ ...subject, collectiveId: collectiveContext(subject).collectiveId, pageId }))
     	})
     /**
@@ Expand Down @@