From 8a68db1aa0bd7b20516bdebcd215a6e8d7152f5d Mon Sep 17 00:00:00 2001 From: David Dal Busco Date: Fri, 20 Feb 2026 09:16:04 +0100 Subject: [PATCH] feat: make cli close revert config optional --- src/page-objects/_browser.page.ts | 8 +------- src/page-objects/_page.ts | 3 --- src/page-objects/cli.page.ts | 15 ++++++--------- 3 files changed, 7 insertions(+), 19 deletions(-) delete mode 100644 src/page-objects/_page.ts diff --git a/src/page-objects/_browser.page.ts b/src/page-objects/_browser.page.ts index e7077db..ef1561e 100644 --- a/src/page-objects/_browser.page.ts +++ b/src/page-objects/_browser.page.ts @@ -1,5 +1,4 @@ import type {Browser, BrowserContext, Page} from '@playwright/test'; -import {TestPage} from './_page'; export interface BrowserPageParams { page: Page; @@ -7,22 +6,17 @@ export interface BrowserPageParams { browser: Browser; } -export abstract class BrowserPage extends TestPage { +export abstract class BrowserPage { protected readonly page: Page; protected readonly context: BrowserContext; protected readonly browser: Browser; protected constructor({page, context, browser}: BrowserPageParams) { - super(); - this.page = page; this.context = context; this.browser = browser; } - /** - * @override - */ async close(): Promise { await this.page.close(); } diff --git a/src/page-objects/_page.ts b/src/page-objects/_page.ts deleted file mode 100644 index 5522e0e..0000000 --- a/src/page-objects/_page.ts +++ /dev/null @@ -1,3 +0,0 @@ -export abstract class TestPage { - abstract close(): Promise; -} diff --git a/src/page-objects/cli.page.ts b/src/page-objects/cli.page.ts index ec7a123..20c6069 100644 --- a/src/page-objects/cli.page.ts +++ b/src/page-objects/cli.page.ts @@ -4,7 +4,6 @@ import {execute, spawn} from '@junobuild/cli-tools'; import {statSync} from 'node:fs'; import {readdir, readFile, writeFile} from 'node:fs/promises'; import {join} from 'node:path'; -import {TestPage} from './_page'; const DEV = (process.env.NODE_ENV ?? 'production') === 'development'; @@ -22,12 +21,10 @@ export interface CliPageParams { satelliteId: PrincipalText; } -export class CliPage extends TestPage { +export class CliPage { #satelliteId: PrincipalText; private constructor({satelliteId}: CliPageParams) { - super(); - this.#satelliteId = satelliteId; } @@ -214,11 +211,11 @@ export class CliPage extends TestPage { return {accessKey: accessKey.trim()}; } - /** - * @override - */ - async close(): Promise { - await this.revertConfig(); + async close({revertConfig}: {revertConfig: boolean} = {revertConfig: true}): Promise { + if (revertConfig) { + await this.revertConfig(); + } + await this.logout(); } }