Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
process.env.NODE_ENV = 'development'
process.env.npm_package_name = 'nextcloud-e2e-test-server'

import type { RunExecOptions, RunExecResult } from './lib/docker.ts'
import type { RunExecOptions, RunExecResult } from './lib/docker/index.ts'

import { defineConfig } from 'cypress'
import vitePreprocessor from 'cypress-vite'
Expand All @@ -20,7 +20,7 @@ import {
startNextcloud,
stopNextcloud,
waitOnNextcloud,
} from './lib/docker.ts'
} from './lib/docker/index.ts'

export default defineConfig({
projectId: 'h2z7r3',
Expand Down
2 changes: 1 addition & 1 deletion eslint.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default defineConfig([

{
name: 'node-scripts',
files: ['lib/docker.ts', 'playwright/**/*.mjs'],
files: ['lib/docker/**/*.ts', 'playwright/**/*.mjs'],
languageOptions: {
globals: {
...globals.node,
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/docker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

import type { RunExecOptions, RunExecResult } from '../docker.ts'
import type { RunExecOptions, RunExecResult } from '../docker/index.ts'

const defaultOptions = {
failOnError: true,
Expand All @@ -13,8 +13,8 @@

/**
*
* @param command

Check warning on line 16 in lib/commands/docker.ts

View workflow job for this annotation

GitHub Actions / eslint

Missing JSDoc @PARAM "command" description
* @param options

Check warning on line 17 in lib/commands/docker.ts

View workflow job for this annotation

GitHub Actions / eslint

Missing JSDoc @PARAM "options" description
*/
export function runCommand(command: string[] | string, options?: Partial<RunExecOptions>): Cypress.Chainable<RunExecResult> {
const env = Object.entries(options?.env ?? {})
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/occ.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

import type { RunExecOptions, RunExecResult } from '../docker.ts'
import type { RunExecOptions, RunExecResult } from '../docker/index.ts'

import { runCommand } from './docker.ts'

/**
*
* @param command

Check warning on line 12 in lib/commands/occ.ts

View workflow job for this annotation

GitHub Actions / eslint

Missing JSDoc @PARAM "command" description
* @param options

Check warning on line 13 in lib/commands/occ.ts

View workflow job for this annotation

GitHub Actions / eslint

Missing JSDoc @PARAM "options" description
*/
export function runOccCommand(command: string, options?: Partial<RunExecOptions>): Cypress.Chainable<RunExecResult> {
return runCommand(['php', 'occ', command], { verbose: true, ...options })
Expand Down
2 changes: 1 addition & 1 deletion lib/cypress.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

import type { RunExecOptions, RunExecResult } from './docker.ts'
import type { RunExecOptions, RunExecResult } from './docker/index.ts'
import type { Selector } from './selectors/index.ts'

import { getNc, restoreState, runCommand, runOccCommand, saveState } from './commands/index.ts'
Expand Down
Loading
Loading