test(cy): add getCollectives and getTrashCollectives commands

Also return the collective from deleteAndSeedCollective

Signed-off-by: Max <max@nextcloud.com>

cypress/support/commands.js

@@ -174,6 +174,8 @@ Cypress.Commands.add('deleteAndSeedCollective', (name) => {
 	Cypress.log()
 	cy.deleteCollective(name)
 	cy.seedCollective(name)
+	cy.getCollectives()
+		.findBy({ name })
 })
 
 Cypress.Commands.add('seedCollective', (name) => {
@@ -215,30 +217,34 @@ Cypress.Commands.add('deleteCollective', (name) => {
 	cy.deleteCollectiveFromTrash(name)
 })
 
+Cypress.Commands.add('getCollectives', () => {
+	return api.getCollectives()
+		.then(response => response.data.data)
+})
+
 /**
  * Move a collective into the trash if it exists.
  *
  * This command will succeed if the collective does not exist at all.
  */
 Cypress.Commands.add('trashCollective', (name) => {
-	cy.then(() => {
-		return api.getCollectives()
-			.then(response => response.data.data)
-	})
+	cy.getCollectives()
 		.findBy({ name })
 		.then((found) => found && api.trashCollective(found.id))
 })
 
+Cypress.Commands.add('getTrashCollectives', () => {
+	return api.getTrashCollectives()
+		.then(response => response.data.data)
+})
+
 /**
  * Clear a collective from the trash if it is in there.
  *
  * This command will succeed if the collective does not exist at all.
  */
 Cypress.Commands.add('deleteCollectiveFromTrash', (name) => {
-	cy.then(() => {
-		return api.getTrashCollectives()
-			.then(response => response.data.data)
-	})
+	cy.getTrashCollectives()
 		.findBy({ name })
 		.then((found) => found && api.deleteCollective(found.id))
 })