Slugify Collectives and Pages (try fix cypress)

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>
nextcloud · Jan 21, 2025 · 9f76e1b · 9f76e1b
1 parent 090d6f3
commit 9f76e1b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/cypress/e2e/pages-links.spec.js b/cypress/e2e/pages-links.spec.js
@@ -4,15 +4,15 @@
  */
 
 const baseUrl = Cypress.env('baseUrl')
-const sourceUrl = new URL(`${baseUrl}/index.php/apps/collectives/Link%20Testing/Link%20Source`)
-let imageId, pdfId, textId
-let anotherCollectiveFirstPageId, linkTargetPageId
+let imageId, pdfId, textId, sourceUrl
+let anotherCollectiveFirstPageId, anotherCollectiveId, linkTestingCollectiveId, linkTargetPageId
 
 describe('Page link handling', function() {
 	before(function() {
 		cy.loginAs('bob')
 		cy.deleteAndSeedCollective('Another Collective')
-			.seedPage('First Page', '', 'Readme.md').then(({ pageId }) => {
+			.seedPage('First Page', '', 'Readme.md').then(({ collectiveId, pageId }) => {
+				anotherCollectiveId = collectiveId
 				anotherCollectiveFirstPageId = pageId
 			})
 		cy.deleteAndSeedCollective('Link Testing')
@@ -21,7 +21,10 @@ 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 }) => {
+				linkTestingCollectiveId = collectiveId
+				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 @@