Merge pull request #896 from nextcloud-libraries/fix/cypress-occ

feat(cypress): return exec context to allow working with exit code or output

Author: susnux

lib/commands/docker.ts

@@ -12,12 +12,12 @@ function getContainerName(): Cypress.Chainable<string> {
 	})
 }
 
-export function runCommand(command: string, options?: Partial<Cypress.ExecOptions>) {
+export function runCommand(command: string, options?: Partial<Cypress.ExecOptions>): Cypress.Chainable<Cypress.Exec> {
 	const env = Object.entries(options?.env ?? {})
 		.map(([name, value]) => `-e '${name}=${value}'`)
 		.join(' ')
 
-	getContainerName()
+	return getContainerName()
 		.then((containerName) => {
 			// Wrapping command inside bash -c "..." to allow using '*'.
 			return cy.exec(`docker exec --user www-data --workdir /var/www/html ${env} ${containerName} bash -c "${command}"`, options)

lib/commands/getNc.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import type { Selector } from "../selectors"
+import type { Selector } from "../selectors/index.ts"
 
 export const getNc = function(selector: Selector, args: Object = {}): Cypress.Chainable<JQuery<HTMLElement>> {
 	if (typeof selector !== 'function') {

lib/commands/occ.ts

@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { runCommand } from "./docker"
+import { runCommand } from "./docker.ts"
 
-export function runOccCommand(command: string, options?: Partial<Cypress.ExecOptions>) {
-	runCommand(`php ./occ ${command}`, options)
+export function runOccCommand(command: string, options?: Partial<Cypress.ExecOptions>): Cypress.Chainable<Cypress.Exec> {
+	return runCommand(`php ./occ ${command}`, options)
 }