mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-11-20 20:43:01 +03:00
fixes
This commit is contained in:
@@ -2,7 +2,9 @@
|
||||
* Shared setup-wizard e2e helpers.
|
||||
*
|
||||
* The wizard shows when config has no cameras, so a first run is mocked by
|
||||
* serving a camera-less config until the returned callback is fired.
|
||||
* serving a camera-less config until the returned callback is fired. Firing
|
||||
* it is only needed by tests that care what the rest of the app sees; the
|
||||
* wizard itself tracks added cameras from the camera dialog's own callback.
|
||||
*/
|
||||
|
||||
import type { Page } from "@playwright/test";
|
||||
@@ -32,7 +34,7 @@ export async function installFirstRun(
|
||||
};
|
||||
}
|
||||
|
||||
export async function gotoDetectorStep(page: Page, addCamera: () => void) {
|
||||
export async function gotoDetectorStep(page: Page) {
|
||||
await page.getByRole("button", { name: "Get Started" }).click();
|
||||
|
||||
// the account step sits between welcome and camera whenever auth is on,
|
||||
@@ -43,17 +45,7 @@ export async function gotoDetectorStep(page: Page, addCamera: () => void) {
|
||||
await page.getByRole("button", { name: "Skip" }).click();
|
||||
|
||||
await expect(page.getByText("Add Your First Camera")).toBeVisible();
|
||||
await page.getByRole("button", { name: "Skip" }).click();
|
||||
|
||||
// the camera step's Next only renders once its local addedCameras fills,
|
||||
// which SetupCamera does by refetching config when the dialog closes, so
|
||||
// opening and cancelling the dialog is what reveals Next
|
||||
await page.getByRole("button", { name: "Add Camera" }).click();
|
||||
addCamera();
|
||||
await page.getByRole("button", { name: "Cancel" }).click();
|
||||
|
||||
await expect(page.getByRole("button", { name: "Next" })).toBeVisible({
|
||||
timeout: 10_000,
|
||||
});
|
||||
await page.getByRole("button", { name: "Next" }).click();
|
||||
await expect(page.getByText("Object Detection")).toBeVisible();
|
||||
}
|
||||
|
||||
@@ -155,7 +155,7 @@ test.describe("setup wizard account @high @mobile", () => {
|
||||
frigateApp,
|
||||
page,
|
||||
}) => {
|
||||
const addCamera = await installFirstRun(frigateApp, page);
|
||||
await installFirstRun(frigateApp, page);
|
||||
await captureUserCalls(page);
|
||||
|
||||
await frigateApp.gotoAndWait("/", "text=Welcome to Frigate");
|
||||
@@ -173,16 +173,8 @@ test.describe("setup wizard account @high @mobile", () => {
|
||||
await expect(page.getByText("Password set")).toBeVisible();
|
||||
await page.getByRole("button", { name: "Next" }).click();
|
||||
|
||||
// the camera step has no Skip, so it is advanced the way the detector
|
||||
// helper does, by opening and cancelling the add dialog
|
||||
await expect(page.getByText("Add Your First Camera")).toBeVisible();
|
||||
await page.getByRole("button", { name: "Add Camera" }).click();
|
||||
addCamera();
|
||||
await page.getByRole("button", { name: "Cancel" }).click();
|
||||
await expect(page.getByRole("button", { name: "Next" })).toBeVisible({
|
||||
timeout: 10_000,
|
||||
});
|
||||
await page.getByRole("button", { name: "Next" }).click();
|
||||
await page.getByRole("button", { name: "Skip" }).click();
|
||||
|
||||
// every remaining step is passed without writing config: Skip on the
|
||||
// detector, then Auto on hwaccel, which has nothing to derive and so
|
||||
|
||||
@@ -61,7 +61,7 @@ test.describe("setup wizard hardware @high @mobile", () => {
|
||||
frigateApp,
|
||||
page,
|
||||
}) => {
|
||||
const addCamera = await installFirstRun(frigateApp, page, {
|
||||
await installFirstRun(frigateApp, page, {
|
||||
hwaccel: {
|
||||
recommended: "vaapi",
|
||||
available: [
|
||||
@@ -79,7 +79,7 @@ test.describe("setup wizard hardware @high @mobile", () => {
|
||||
const saves = await captureSaves(page);
|
||||
|
||||
await frigateApp.gotoAndWait("/", "text=Welcome to Frigate");
|
||||
await gotoDetectorStep(page, addCamera);
|
||||
await gotoDetectorStep(page);
|
||||
|
||||
// the default hardware mock reports two Corals, an Intel GPU, and the CPU
|
||||
await expect(
|
||||
@@ -124,13 +124,13 @@ test.describe("setup wizard hardware @high @mobile", () => {
|
||||
frigateApp,
|
||||
page,
|
||||
}) => {
|
||||
const addCamera = await installFirstRun(frigateApp, page, {
|
||||
await installFirstRun(frigateApp, page, {
|
||||
hardware: NVIDIA_HARDWARE,
|
||||
});
|
||||
const saves = await captureSaves(page);
|
||||
|
||||
await frigateApp.gotoAndWait("/", "text=Welcome to Frigate");
|
||||
await gotoDetectorStep(page, addCamera);
|
||||
await gotoDetectorStep(page);
|
||||
|
||||
await expect(
|
||||
page.getByRole("radio", { name: /NVIDIA GeForce RTX 3060/ }),
|
||||
@@ -165,7 +165,7 @@ test.describe("setup wizard hardware @high @mobile", () => {
|
||||
frigateApp,
|
||||
page,
|
||||
}) => {
|
||||
const addCamera = await installFirstRun(frigateApp, page, {
|
||||
await installFirstRun(frigateApp, page, {
|
||||
hardware: NVIDIA_HARDWARE,
|
||||
hwaccel: {
|
||||
recommended: "nvidia",
|
||||
@@ -175,7 +175,7 @@ test.describe("setup wizard hardware @high @mobile", () => {
|
||||
await captureSaves(page);
|
||||
|
||||
await frigateApp.gotoAndWait("/", "text=Welcome to Frigate");
|
||||
await gotoDetectorStep(page, addCamera);
|
||||
await gotoDetectorStep(page);
|
||||
await page
|
||||
.getByRole("button", { name: "Continue without detection" })
|
||||
.click();
|
||||
@@ -201,7 +201,7 @@ test.describe("setup wizard hardware @high @mobile", () => {
|
||||
frigateApp,
|
||||
page,
|
||||
}) => {
|
||||
const addCamera = await installFirstRun(frigateApp, page, {
|
||||
await installFirstRun(frigateApp, page, {
|
||||
hwaccel: {
|
||||
recommended: "jetson",
|
||||
available: [
|
||||
@@ -218,7 +218,7 @@ test.describe("setup wizard hardware @high @mobile", () => {
|
||||
const saves = await captureSaves(page);
|
||||
|
||||
await frigateApp.gotoAndWait("/", "text=Welcome to Frigate");
|
||||
await gotoDetectorStep(page, addCamera);
|
||||
await gotoDetectorStep(page);
|
||||
await page.getByRole("button", { name: "Next" }).click();
|
||||
await expect(page.getByText("Hardware Acceleration")).toBeVisible();
|
||||
|
||||
@@ -238,11 +238,11 @@ test.describe("setup wizard hardware @high @mobile", () => {
|
||||
frigateApp,
|
||||
page,
|
||||
}) => {
|
||||
const addCamera = await installFirstRun(frigateApp, page);
|
||||
await installFirstRun(frigateApp, page);
|
||||
const saves = await captureSaves(page);
|
||||
|
||||
await frigateApp.gotoAndWait("/", "text=Welcome to Frigate");
|
||||
await gotoDetectorStep(page, addCamera);
|
||||
await gotoDetectorStep(page);
|
||||
await page.getByRole("button", { name: "Next" }).click();
|
||||
await expect(page.getByText("Hardware Acceleration")).toBeVisible();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user