denozord/MikrotikManager
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 104 Wiki Activity

fix(ui): сохранять подтверждённые настройки автообновления

Browse Source
This commit is contained in:
Denozordec committed 2026-10-01 13:56:42 +07:00
1 parent df89e88f4e
commit 1c407b77de
9 files changed
+182 -67
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/e2e/certificates-context.spec.ts
+21 -1
View File
@@ -3,7 +3,7 @@ import {certificate as container,server,certificateState as state} from "./fixtu
const headers={"access-control-allow-origin":"*","access-control-allow-methods":"GET,POST,OPTIONS","access-control-allow-headers":"Content-Type,Authorization"}
for(const change of ["backend","mode"])for(const fails of [false,true])test("Сертификаты: позднее чтение/"+change+"/"+fails,async({page})=>{
let started=false,completed=false,release!:()=>void;const gate=new Promise<void>(r=>release=r)
await page.route("**/health",r=>r.fulfill({headers,json:{ok:true}}));await page.route("**/api/**",r=>{const p=new URL(r.request().url()).pathname;return r.fulfill({headers,json:p==="/api/auth/config"?{required:false}:p==="/api/servers"?[server]:p==="/api/certificates/state"?state():{directoryUrl:"https://acme.example.test/directory",tokenConfigured:false,enabled:false,intervalSec:300,daysBeforeExpiry:30}})})
await page.route("**/health",r=>r.fulfill({headers,json:{ok:true}}));await page.route("**/api/**",r=>{const p=new URL(r.request().url()).pathname;return r.fulfill({headers,json:p==="/api/auth/config"?{required:false}:p==="/api/servers"?[server]:p==="/api/certificates/state"?state():{directoryUrl:"https://acme.example.test/directory",tokenConfigured:false,enabled:false,intervalSec:300,renewBeforeDays:30}})})
await page.route("**/api/certificates/state",async r=>{if(new URL(r.request().url()).port!=="8000")return r.fallback();started=true;await gate;try{await r.fulfill(fails?{headers,status:503,json:{error:"СТАРАЯ ОШИБКА сертификатов"}}:{headers,json:state([{...container,name:"СТАРЫЙ СЕРТИФИКАТ"}])})}catch{}finally{completed=true}})
await page.goto("/certificates");await expect.poll(()=>started).toBe(true);await page.goto("/settings")
if(change==="backend"){const input=page.getByPlaceholder("http://localhost:8000");await input.fill("http://localhost:8101");await input.press("Enter")}else await page.getByRole("button",{name:"Моковые",exact:true}).click()
@@ -11,3 +11,23 @@ for(const change of ["backend","mode"])for(const fails of [false,true])test("С
if(change==="backend")await expect(page.getByText(container.name,{exact:true})).toBeVisible();else await expect(page.getByText("Моковые данные",{exact:true})).toBeVisible()
await expect(page.getByText("СТАРЫЙ СЕРТИФИКАТ",{exact:true})).toHaveCount(0);await expect(page.getByText(/СТАРАЯ ОШИБКА сертификатов/)).toHaveCount(0)
})
for (const fails of [false, true]) test("Сертификаты: позднее сохранение renew/" + fails, async ({ page }) => {
let started = false, completed = false, release!: () => void; const gate = new Promise<void>(r => release = r)
await page.route("**/health", r => r.fulfill({ headers, json: { ok: true } }))
await page.route("**/api/**", r => {
const path = new URL(r.request().url()).pathname
return r.fulfill({ headers, json: path === "/api/auth/config" ? { required: false } : path === "/api/servers" ? [server] : path === "/api/certificates/state" ? state() : path === "/api/certificates/renew-settings" ? { enabled: true, intervalSec: 21600, renewBeforeDays: 30 } : { directoryUrl: "https://acme.example.test/directory", tokenConfigured: false } })
})
await page.route("**/api/certificates/renew-settings", async r => {
if (r.request().method() !== "PUT") return r.fallback()
started = true; await gate
try { await r.fulfill(fails ? { headers, status: 503, json: { error: "СТАРОЕ СОХРАНЕНИЕ ОТКАЗ" } } : { headers, json: { enabled: false, intervalSec: 21600, renewBeforeDays: 30 } }) } catch {} finally { completed = true }
})
await page.goto("/certificates"); const toggle = page.getByRole("switch", { name: "Автообновление сертификатов", exact: true })
await expect(toggle).toBeChecked(); await toggle.click(); await expect.poll(() => started).toBe(true)
await page.goto("/settings"); const input = page.getByPlaceholder("http://localhost:8000"); await input.fill("http://localhost:8101"); await input.press("Enter")
await page.goto("/certificates"); await expect(toggle).toBeChecked(); release(); await expect.poll(() => completed).toBe(true)
await expect(toggle).toBeChecked(); await expect(page.getByText("СТАРОЕ СОХРАНЕНИЕ ОТКАЗ", { exact: true })).toHaveCount(0)
await expect(page.getByText("Автообновление выключено", { exact: true })).toHaveCount(0)
})
tests/e2e/certificates-data.spec.ts
+1 -1
View File
@@ -6,7 +6,7 @@ test.beforeEach(async ({ page }) => {
await page.route("**/health", r => r.fulfill({ json: { ok: true } }))
await page.route("**/api/**", r => {
const path = new URL(r.request().url()).pathname
return r.fulfill({ json: path === "/api/auth/config" ? { required: false } : path === "/api/servers" ? [server] : path === "/api/certificates/state" ? certificateState() : { directoryUrl: "https://acme.example.test/directory", tokenConfigured: false, enabled: false, intervalSec: 300, daysBeforeExpiry: 30 } })
return r.fulfill({ json: path === "/api/auth/config" ? { required: false } : path === "/api/servers" ? [server] : path === "/api/certificates/state" ? certificateState() : { directoryUrl: "https://acme.example.test/directory", tokenConfigured: false, enabled: false, intervalSec: 300, renewBeforeDays: 30 } })
})
})
for (const kind of ["API", "malformed", "duplicate", "foreign"] as const) test("Сертификаты: первоначальный отказ " + kind + " и восстановление", async ({ page }) => {
tests/e2e/certificates-renew.spec.ts
+50
View File
@@ -0,0 +1,50 @@
import { test, expect, type Page } from "@playwright/test"
import { certificateState, server } from "./fixtures/certificates"
const renew = { enabled: true, intervalSec: 21600, renewBeforeDays: 30 }
const interval = (page: Page) => page.getByRole("textbox", { name: "Интервал проверки сертификатов", exact: true })
const save = (page: Page) => page.getByRole("button", { name: "Сохранить расписание", exact: true })
const toggle = (page: Page) => page.getByRole("switch", { name: "Автообновление сертификатов", exact: true })
test.beforeEach(async ({ page }) => {
await page.route("**/health", r => r.fulfill({ json: { ok: true } }))
await page.route("**/api/**", r => {
const path = new URL(r.request().url()).pathname
return r.fulfill({ json: path === "/api/auth/config" ? { required: false } : path === "/api/servers" ? [server] : path === "/api/certificates/state" ? certificateState() : path === "/api/certificates/renew-settings" ? renew : { directoryUrl: "https://acme.example.test/directory", tokenConfigured: false } })
})
})
for (const malformed of [false, true]) test("Автообновление: первоначальный отказ " + malformed + " не разрешает defaults", async ({ page }) => {
let fail = true
await page.route("**/api/certificates/renew-settings", r => r.fulfill(fail ? malformed ? { json: {} } : { status: 503, json: { error: "Отказ расписания" } } : { json: renew }))
await page.goto("/certificates")
await expect(page.getByRole("alert", { name: "Настройки автообновления" })).toBeVisible()
await expect(toggle(page)).toBeDisabled(); await expect(save(page)).toBeDisabled(); await expect(interval(page)).toHaveValue("")
fail = false; await page.getByRole("button", { name: "Перечитать настройки автообновления" }).click()
await expect(interval(page)).toHaveValue("21600"); await expect(toggle(page)).toBeChecked()
})
for (const malformed of [false, true]) test("Автообновление: отказ сохранения " + malformed + " сохраняет черновик", async ({ page }) => {
await page.route("**/api/certificates/renew-settings", r => r.request().method() === "PUT" ? r.fulfill(malformed ? { json: {} } : { status: 503, json: { error: "Сохранение отказало" } }) : r.fulfill({ json: renew }))
await page.goto("/certificates"); await expect(interval(page)).toHaveValue("21600")
await interval(page).fill("900"); await save(page).click()
await expect(page.getByRole("alert", { name: "Настройки автообновления" })).toContainText("результат операции не подтверждён")
await expect(interval(page)).toHaveValue("900"); await expect(toggle(page)).toBeChecked()
await expect(page.getByText("Расписание автообновления сохранено", { exact: true })).toHaveCount(0)
})
for (const value of ["bad", "299", "300oops", "1.5"]) test("Автообновление: invalid interval " + value + " не подменяется default", async ({ page }) => {
let writes = 0; await page.route("**/api/certificates/renew-settings", r => { if (r.request().method() === "PUT") writes++; return r.fulfill({ json: renew }) })
await page.goto("/certificates"); await expect(interval(page)).toHaveValue("21600")
await interval(page).fill(value); await save(page).click()
await expect(page.getByRole("alert", { name: "Настройки автообновления" })).toContainText("Введите целые числа")
expect(writes).toBe(0); await expect(interval(page)).toHaveValue(value)
})
test("Автообновление: single flight переключателя и подтверждённый false", async ({ page }) => {
let writes = 0; let release!: () => void; const gate = new Promise<void>(r => release = r)
await page.route("**/api/certificates/renew-settings", async r => { if (r.request().method() === "GET") return r.fulfill({ json: renew }); writes++; await gate; await r.fulfill({ json: { ...renew, enabled: false } }) })
await page.goto("/certificates"); await expect(toggle(page)).toBeChecked(); await toggle(page).click()
await expect(toggle(page)).toBeDisabled(); await expect(save(page)).toBeDisabled(); expect(writes).toBe(1)
release(); await expect(toggle(page)).not.toBeChecked(); await expect(page.getByText("Автообновление выключено", { exact: true })).toBeVisible()
})
test("Автообновление: фоновое чтение не стирает dirty черновик", async ({ page }) => {
let second = false; await page.route("**/api/certificates/renew-settings", r => r.fulfill({ json: { ...renew, intervalSec: second ? 7200 : 21600 } }))
await page.goto("/certificates"); await expect(interval(page)).toHaveValue("21600"); await interval(page).fill("900")
second = true; await page.getByRole("button", { name: "Перечитать настройки автообновления" }).click()
await expect(interval(page)).toBeEnabled(); await expect(interval(page)).toHaveValue("900")
})
tests/e2e/certificates-url.spec.ts
+1 -1
View File
@@ -4,7 +4,7 @@ test.beforeEach(async ({ page }) => {
await page.route("**/health", r => r.fulfill({ json: { ok: true } }))
await page.route("**/api/**", r => {
const path = new URL(r.request().url()).pathname
return r.fulfill({ json: path === "/api/auth/config" ? { required: false } : path === "/api/servers" ? [server] : path === "/api/certificates/state" ? certificateState() : { directoryUrl: "https://acme.example.test/directory", tokenConfigured: false, enabled: false, intervalSec: 300, daysBeforeExpiry: 30 } })
return r.fulfill({ json: path === "/api/auth/config" ? { required: false } : path === "/api/servers" ? [server] : path === "/api/certificates/state" ? certificateState() : { directoryUrl: "https://acme.example.test/directory", tokenConfigured: false, enabled: false, intervalSec: 300, renewBeforeDays: 30 } })
})
})
for (const query of ["server=bad", "server=1&server=2", "status=bad", "q=a&q=b"]) test("Сертификаты URL: неверный контекст " + query, async ({ page }) => {