Skip to content

Commit

Permalink
lint fix
Browse files Browse the repository at this point in the history
Signed-off-by: nabim777 <[email protected]>
  • Loading branch information
nabim777 committed Jan 21, 2025
1 parent 51b3fec commit 012bb0e
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down
20 changes: 10 additions & 10 deletions packages/web-app-progress-bars/tests/e2e/progressBar.spec.ts
Original file line number Diff line number Diff line change
@@ -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')
})
const progressBarCurrent = await accountPage.progressBarCurrent.textContent()
expect(progressBarCurrent).toEqual('Nyan Cat progress bar')
})
6 changes: 3 additions & 3 deletions packages/web-app-progress-bars/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ export default defineConfig({
output: {
entryFileNames: 'progress-bars.js'
}
},
test: {
exclude: ['**/e2e/**']
}
},
test: {
exclude: ['**/e2e/**']
}
})
6 changes: 3 additions & 3 deletions playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
},
Expand Down
20 changes: 10 additions & 10 deletions support/pages/accountPage.ts
Original file line number Diff line number Diff line change
@@ -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()
}
}

0 comments on commit 012bb0e

Please sign in to comment.