From 012bb0eb03effc3036cc0d451c23cf72956e32d3 Mon Sep 17 00:00:00 2001 From: nabim777 Date: Tue, 21 Jan 2025 10:15:11 +0545 Subject: [PATCH] lint fix Signed-off-by: nabim777 --- .drone.star | 2 +- .../tests/e2e/progressBar.spec.ts | 20 +++++++++---------- packages/web-app-progress-bars/vite.config.ts | 6 +++--- playwright.config.ts | 6 +++--- support/pages/accountPage.ts | 20 +++++++++---------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.drone.star b/.drone.star index 4599eee7..fdbe1767 100644 --- a/.drone.star +++ b/.drone.star @@ -344,7 +344,7 @@ def ocisService(): "mkdir -p /apps", "mv packages/web-app-draw-io/dist /apps/draw-io", "mv packages/web-app-unzip/dist /apps/unzip", - "mv packages/web-app-progress-bars/dist /apps/unzip", + "mv packages/web-app-progress-bars/dist /apps/progress-bars", ], "volumes": [ { diff --git a/packages/web-app-progress-bars/tests/e2e/progressBar.spec.ts b/packages/web-app-progress-bars/tests/e2e/progressBar.spec.ts index e39689d5..08d06bb7 100644 --- a/packages/web-app-progress-bars/tests/e2e/progressBar.spec.ts +++ b/packages/web-app-progress-bars/tests/e2e/progressBar.spec.ts @@ -1,23 +1,23 @@ import { test, Page, expect } from '@playwright/test' -import { AccountPage } from "../../../../support/pages/accountPage"; +import { AccountPage } from '../../../../support/pages/accountPage' import { loginAsUser, logout } from '../../../../support/helpers/authHelper' let adminPage: Page test.beforeEach(async ({ browser }) => { - const admin = await loginAsUser(browser, 'admin', 'admin') - adminPage = admin.page + const admin = await loginAsUser(browser, 'admin', 'admin') + adminPage = admin.page }) test.afterEach(async () => { - await logout(adminPage) + await logout(adminPage) }) test('select the progressBarOption', async () => { - const accountPage = new AccountPage(adminPage) - await accountPage.goToAccountPage() - await accountPage.selectProgressBarExtension('Nyan Cat progress bar') + const accountPage = new AccountPage(adminPage) + await accountPage.goToAccountPage() + await accountPage.selectProgressBarExtension('Nyan Cat progress bar') - const progressBarCurrent = await accountPage.progressBarCurrent.textContent() - expect(progressBarCurrent).toEqual('Nyan Cat progress bar') -}) \ No newline at end of file + const progressBarCurrent = await accountPage.progressBarCurrent.textContent() + expect(progressBarCurrent).toEqual('Nyan Cat progress bar') +}) diff --git a/packages/web-app-progress-bars/vite.config.ts b/packages/web-app-progress-bars/vite.config.ts index adb561d4..f7543dbf 100644 --- a/packages/web-app-progress-bars/vite.config.ts +++ b/packages/web-app-progress-bars/vite.config.ts @@ -10,9 +10,9 @@ export default defineConfig({ output: { entryFileNames: 'progress-bars.js' } - }, - test: { - exclude: ['**/e2e/**'] } + }, + test: { + exclude: ['**/e2e/**'] } }) diff --git a/playwright.config.ts b/playwright.config.ts index 5cf948fc..bfcaba98 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -64,17 +64,17 @@ export default defineConfig({ use: { ...devices['Desktop Safari'], browserName: 'webkit', ignoreHTTPSErrors: true }, }, { - name: 'progressBar-chromium', + name: 'progress-bars-chromium', testDir: './packages/web-app-progress-bars/tests/e2e', use: { ...devices['Desktop Chrome'], browserName: 'chromium', ignoreHTTPSErrors: true }, }, { - name: 'progressBar-firefox', + name: 'progress-bars-firefox', testDir: './packages/web-app-progress-bars/tests/e2e', use: { ...devices['Desktop Firefox'], browserName: 'firefox', ignoreHTTPSErrors: true }, }, { - name: 'progressBar-webkit', + name: 'progress-bars-webkit', testDir: './packages/web-app-progress-bars/tests/e2e', use: { ...devices['Desktop Safari'], browserName: 'webkit', ignoreHTTPSErrors: true }, }, diff --git a/support/pages/accountPage.ts b/support/pages/accountPage.ts index 121a487a..1eae7e60 100644 --- a/support/pages/accountPage.ts +++ b/support/pages/accountPage.ts @@ -1,32 +1,32 @@ import { Locator, Page } from '@playwright/test' +import util from 'util' export class AccountPage { readonly page: Page - readonly accountMenuButton: Locator - readonly accountManageButton: Locator + readonly accountMenuBtn: Locator + readonly accountManageBtn: Locator readonly progressBarSelector: Locator - readonly progressBarOption: Locator readonly progressBarCurrent: Locator + readonly progressBarOption: String constructor(page: Page) { this.page = page - this.accountMenuButton = this.page.locator('.oc-topbar-avatar') - this.accountManageButton = this.page.locator('#oc-topbar-account-manage') + this.accountMenuBtn = this.page.locator('.oc-topbar-avatar') + this.accountManageBtn = this.page.locator('#oc-topbar-account-manage') this.progressBarSelector = this.page.locator('.account-page-extensions .extension-preference .vs__search') - this.progressBarOption = this.page.locator('//div[@class="extension-preference"]//span[text()="%s"]') this.progressBarCurrent = this.page.locator('.account-page-extensions .extension-preference .vs__selected span') + this.progressBarOption = '//div[@class="extension-preference"]//span[text()="%s"]' } async goToAccountPage() { - await this.accountMenuButton.click() - await this.accountManageButton.click() + await this.accountMenuBtn.click() + await this.accountManageBtn.click() } async selectProgressBarExtension(name: string){ - await new Promise((resolve) => setTimeout(resolve, 500)) await this.progressBarSelector.waitFor() await this.progressBarSelector.click() - await this.page.getByText(name).click(); + await this.page.locator(util.format(this.progressBarOption, name)).click() } } \ No newline at end of file