mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-05 14:47:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52

Fixed tests.

Browse source
This commit is contained in:
SamTV12345 2024-03-10 23:06:54 +01:00
parent 6fa9e1e673
commit 2ef1bba203
5 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/frontend-admin-tests.yml vendored
View file

@ -138,7 +138,6 @@ jobs:
pnpm exec playwright install-deps pnpm exec playwright install-deps
pnpm run test-admin pnpm run test-admin
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v4
if: always() if: always()
with: with:
name: playwright-report-${{ matrix.node }} name: playwright-report-${{ matrix.node }}

1
.gitignore vendored
View file

@ -27,3 +27,4 @@ pnpm-lock.yaml
/src/templates/admin /src/templates/admin
/src/test-results /src/test-results
playwright-report playwright-report
state.json

2
admin/src/utils/LoadingScreen.tsx
View file

@ -5,7 +5,7 @@ export const LoadingScreen = ()=>{
const showLoading = useStore(state => state.showLoading) const showLoading = useStore(state => state.showLoading)
return <Dialog.Root open={showLoading}><Dialog.Portal> return <Dialog.Root open={showLoading}><Dialog.Portal>
<Dialog.Overlay className="fixed inset-0 bg-black bg-opacity-50 z-50 dialog-overlay" /> <Dialog.Overlay className="loading-screen fixed inset-0 bg-black bg-opacity-50 z-50 dialog-overlay" />
<Dialog.Content className="fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 z-50 dialog-content"> <Dialog.Content className="fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 z-50 dialog-content">
<div className="flex flex-col items-center"> <div className="flex flex-col items-center">
<div className="animate-spin w-16 h-16 border-t-2 border-b-2 border-[--fg-color] rounded-full"></div> <div className="animate-spin w-16 h-16 border-t-2 border-b-2 border-[--fg-color] rounded-full"></div>

3
src/tests/frontend-new/admin-spec/adminsettings.spec.ts
View file

@ -49,10 +49,11 @@ test.describe('admin settings',()=> {
test('restart works', async function ({page}) { test('restart works', async function ({page}) {
await page.goto('http://localhost:9001/admin/settings'); await page.goto('http://localhost:9001/admin/settings');
await page.waitForSelector('.settings')
await restartEtherpad(page) await restartEtherpad(page)
await page.waitForSelector('.settings') await page.waitForSelector('.settings')
const settings = page.locator('.settings'); const settings = page.locator('.settings');
await expect(settings).not.toBeEmpty(); await expect(settings).not.toBeEmpty();
await page.waitForTimeout(1000) await page.waitForSelector('.menu')
}); });
}) })

18
src/tests/frontend-new/helper/adminhelper.ts
View file

@ -1,9 +1,4 @@
import {Page} from "@playwright/test"; import {expect, Page} from "@playwright/test";
export const goToAdminPage = async (page: Page) => {
}
export const loginToAdmin = async (page: Page, username: string, password: string) => { export const loginToAdmin = async (page: Page, username: string, password: string) => {
@ -24,7 +19,14 @@ export const saveSettings = async (page: Page) => {
export const restartEtherpad = async (page: Page) => { export const restartEtherpad = async (page: Page) => {
// Click restart // Click restart
await page.locator('.settings-button-bar').locator('button').nth(1).click() const restartButton = page.locator('.settings-button-bar').locator('.settingsButton').nth(1)
await page.waitForTimeout(100) const settings = page.locator('.settings');
await expect(settings).not.toBeEmpty();
await expect(restartButton).toBeVisible()
await page.locator('.settings-button-bar')
.locator('.settingsButton')
.nth(1)
.click()
await page.waitForTimeout(500)
await page.waitForSelector('.settings') await page.waitForSelector('.settings')
} }