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-13 15:47:12 +01:00
parent 22ae8111a3
commit bf2b6b99a7
3 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/package.json
View file

@ -10,13 +10,11 @@
"preview": "vite preview" "preview": "vite preview"
}, },
"dependencies": { "dependencies": {
"@monaco-editor/react": "^4.6.0",
"@radix-ui/react-dialog": "^1.0.5", "@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-toast": "^1.1.5", "@radix-ui/react-toast": "^1.1.5",
"i18next": "^23.10.1", "i18next": "^23.10.1",
"i18next-browser-languagedetector": "^7.2.0", "i18next-browser-languagedetector": "^7.2.0",
"lucide-react": "^0.356.0", "lucide-react": "^0.356.0",
"monaco-editor": "0.47.0",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-i18next": "^14.1.0", "react-i18next": "^14.1.0",

26
admin/src/pages/SettingsPage.tsx
View file

@ -3,7 +3,6 @@ import {isJSONClean} from "../utils/utils.ts";
import {Trans} from "react-i18next"; import {Trans} from "react-i18next";
import {IconButton} from "../components/IconButton.tsx"; import {IconButton} from "../components/IconButton.tsx";
import {RotateCw, Save} from "lucide-react"; import {RotateCw, Save} from "lucide-react";
import Editor from '@monaco-editor/react';
export const SettingsPage = ()=>{ export const SettingsPage = ()=>{
const settingsSocket = useStore(state=>state.settingsSocket) const settingsSocket = useStore(state=>state.settingsSocket)
@ -11,18 +10,12 @@ export const SettingsPage = ()=>{
return <div> return <div>
<h1><Trans i18nKey="admin_settings.current"/></h1> <h1><Trans i18nKey="admin_settings.current"/></h1>
<Editor language="json" theme="vs-dark" options={{ <textarea value={settings} className="settings" onChange={v => {
comments: { useStore.getState().setSettings(v.target.value)
ignoreEmptyLines: true, }}/>
insertSpace: true
},
codeLens:false,
inDiffEditor: false
}} value={settings} onChange={(v)=>{
useStore.getState().setSettings(v!)
}} className="settings"/>
<div className="settings-button-bar"> <div className="settings-button-bar">
<IconButton className="settingsButton" icon={<Save/>} title={<Trans i18nKey="admin_settings.current_save.value"/>} onClick={() => { <IconButton className="settingsButton" icon={<Save/>}
title={<Trans i18nKey="admin_settings.current_save.value"/>} onClick={() => {
if (isJSONClean(settings!)) { if (isJSONClean(settings!)) {
// JSON is clean so emit it to the server // JSON is clean so emit it to the server
settingsSocket!.emit('saveSettings', settings!); settingsSocket!.emit('saveSettings', settings!);
@ -39,15 +32,18 @@ export const SettingsPage = ()=>{
}) })
} }
}}/> }}/>
<IconButton className="settingsButton" icon={<RotateCw/>} title={<Trans i18nKey="admin_settings.current_restart.value"/>} onClick={() => { <IconButton className="settingsButton" icon={<RotateCw/>}
title={<Trans i18nKey="admin_settings.current_restart.value"/>} onClick={() => {
settingsSocket!.emit('restartServer'); settingsSocket!.emit('restartServer');
}}/> }}/>
</div> </div>
<div className="separator"/> <div className="separator"/>
<div className="settings-button-bar"> <div className="settings-button-bar">
<a rel="noopener noreferrer" target="_blank" href="https://github.com/ether/etherpad-lite/wiki/Example-Production-Settings.JSON"><Trans <a rel="noopener noreferrer" target="_blank"
href="https://github.com/ether/etherpad-lite/wiki/Example-Production-Settings.JSON"><Trans
i18nKey="admin_settings.current_example-prod"/></a> i18nKey="admin_settings.current_example-prod"/></a>
<a rel="noopener noreferrer" target="_blank" href="https://github.com/ether/etherpad-lite/wiki/Example-Development-Settings.JSON"><Trans <a rel="noopener noreferrer" target="_blank"
href="https://github.com/ether/etherpad-lite/wiki/Example-Development-Settings.JSON"><Trans
i18nKey="admin_settings.current_example-devel"/></a> i18nKey="admin_settings.current_example-devel"/></a>
</div> </div>
</div> </div>

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

@ -1,5 +1,6 @@
import {expect, test} from "@playwright/test"; import {expect, test} from "@playwright/test";
import {loginToAdmin, restartEtherpad, saveSettings} from "../helper/adminhelper"; import {loginToAdmin, restartEtherpad, saveSettings} from "../helper/adminhelper";
import exp from "node:constants";
test.beforeEach(async ({ page })=>{ test.beforeEach(async ({ page })=>{
await loginToAdmin(page, 'admin', 'changeme1'); await loginToAdmin(page, 'admin', 'changeme1');