4565: Worked on test refactor

Author: tuj

assets/admin/admin-config-loader.js

@@ -22,9 +22,7 @@ const AdminConfigLoader = {
               resolve(configData);
             } else {
               // eslint-disable-next-line no-console
-              console.error(
-                "Could not load config. Will use default config."
-              );
+              console.error("Could not load config. Will use default config.");
 
               // Default config.
               resolve({

assets/client/client-config-loader.js

@@ -1,5 +1,5 @@
 // Only fetch new config if more than 15 minutes have passed.
-import appStorage from './util/app-storage';
+import appStorage from "./util/app-storage";
 
 const configFetchIntervalDefault = 15 * 60 * 1000;
 
@@ -22,7 +22,7 @@ const ClientConfigLoader = {
 
       if (
         latestFetchTimestamp +
-        (configData?.configFetchInterval ?? configFetchIntervalDefault) >=
+          (configData?.configFetchInterval ?? configFetchIntervalDefault) >=
         nowTimestamp
       ) {
         resolve(configData);
@@ -43,15 +43,13 @@ const ClientConfigLoader = {
               resolve(configData);
             } else {
               // eslint-disable-next-line no-console
-              console.error(
-                'Could not load config. Will use default config.'
-              );
+              console.error("Could not load config. Will use default config.");
 
               // Default config.
               resolve({
-                apiEndpoint: '/api',
+                apiEndpoint: "/api",
                 dataStrategy: {
-                  type: 'pull',
+                  type: "pull",
                   config: {
                     interval: 30000,
                   },
@@ -61,7 +59,7 @@ const ClientConfigLoader = {
                 refreshTokenTimeout: 15000,
                 releaseTimestampIntervalTimeout: 600000,
                 colorScheme: {
-                  type: 'library',
+                  type: "library",
                   lat: 56.0,
                   lng: 10.0,
                 },

assets/client/service/release-service.js

@@ -74,7 +74,7 @@ class ReleaseService {
       this.releaseCheckInterval = setInterval(
         this.checkForNewRelease,
         config.releaseTimestampIntervalTimeout ??
-        defaults.releaseTimestampIntervalTimeoutDefault,
+          defaults.releaseTimestampIntervalTimeoutDefault,
       );
     });
   };

assets/tests/admin/admin-campaign.spec.js

@@ -1,24 +1,16 @@
 import { test, expect } from "@playwright/test";
-import { abortUnhandledRoutes, loginTest } from "./admin-helper.js";
-import { emptyJson, slidesJson1 } from "./data-fixtures.js";
+import { awaitDataRoute, awaitEmptyRoutes, beforeEachTest, loginTest } from "./test-helper.js";
+import { slidesJson1 } from "./data-fixtures.js";
 
 test.describe("Campaign pages work", () => {
   test.beforeEach(async ({ page }) => {
-    await abortUnhandledRoutes(page);
+    await beforeEachTest(page);
   });
 
   test.beforeEach(async ({ page }) => {
     await loginTest({ page });
 
-    await page.route("**/playlists*", async (route) => {
-      await route.fulfill({ json: emptyJson });
-    });
-    await page.route("**/screens*", async (route) => {
-      await route.fulfill({ json: emptyJson });
-    });
-    await page.route("**/screen-groups*", async (route) => {
-      await route.fulfill({ json: emptyJson });
-    });
+    await awaitEmptyRoutes(page, ["**/playlists*", "**/screens*", "**/screen-groups*"]);
 
     await page.locator(".sidebar-nav .nav-link").getByText("Kampagner").click();
     await expect(page.locator("h1").getByText("Kampagner")).toBeVisible();
@@ -33,9 +25,7 @@ test.describe("Campaign pages work", () => {
 
   test("It removes slide", async ({ page }) => {
     // Intercept slides in dropdown
-    await page.route("**/slides*", async (route) => {
-      await route.fulfill({ json: slidesJson1 });
-    });
+    await awaitDataRoute(page, "**/slides*", slidesJson1);
 
     // Pick slide
     await page

assets/tests/admin/admin-content-string.spec.js

@@ -1,12 +1,7 @@
 import { test, expect } from "@playwright/test";
 import contentString from "../../admin/components/util/helpers/content-string.jsx";
-import { abortUnhandledRoutes } from "./admin-helper.js";
 
 test.describe("Content string", () => {
-  test.beforeEach(async ({ page }) => {
-    await abortUnhandledRoutes(page);
-  });
-
   test("It creates a string: 'test and test'", async ({ page }) => {
     expect(contentString([{ name: "test" }, { name: "test" }], "and")).toBe(
       "test and test",

assets/tests/admin/admin-feed-sources.spec.js

@@ -3,36 +3,39 @@ import {
   errorJson,
   feedSourcesJson,
   feedSourcesJson2,
-  feedSourcesJson3,
+  feedSourceSingleJson
 } from "./data-fixtures.js";
-import { abortUnhandledRoutes, loginTest } from "./admin-helper.js";
+import { awaitDataRoute, awaitEmptyRoutes, beforeEachTest, loginTest } from "./test-helper.js";
 
 test.describe("feed sources", () => {
   test.beforeEach(async ({ page }) => {
-    await abortUnhandledRoutes(page);
+    await beforeEachTest(page);
   });
 
   test.beforeEach(async ({ page }) => {
     await loginTest({ page });
 
-    await page.route("**/feed-sources*", async (route) => {
-      await route.fulfill({ json: feedSourcesJson });
-    });
+    await awaitDataRoute(page, "**/feed-sources*", feedSourcesJson);
+
+    await page
+      .locator(".sidebar-nav .nav-link")
+      .getByText("Datakilder")
+      .click();
+
+    await awaitEmptyRoutes(page, ["**/slides*"]);
 
-    await page.locator(".sidebar-nav .nav-link").getByText("Datakilder").click();
     await expect(page.locator("h1").getByText("Datakilder")).toBeVisible();
   });
 
   test("It loads create datakilde page", async ({ page }) => {
-    page.getByText("Opret ny datakilde").click();
+    await page.getByText("Opret ny datakilde").click();
     await expect(page.locator("#save")).toBeVisible();
   });
 
   test("It display error toast on save error", async ({ page }) => {
-    await page.route("**/feed-sources", async (route) => {
-      await route.fulfill({ status: 500, json: errorJson });
-    });
-    page.getByText("Opret ny datakilde").click();
+    await awaitDataRoute(page, "**/feed-sources*", errorJson, 500);
+
+    await page.getByText("Opret ny datakilde").click();
 
     // Displays error toast and stays on page
     await expect(
@@ -53,7 +56,8 @@ test.describe("feed sources", () => {
   });
 
   test("Cancel create datakilde", async ({ page }) => {
-    page.getByText("Opret ny datakilde").click();
+    await page.getByText("Opret ny datakilde").click();
+
     await expect(page.locator("#cancel")).toBeVisible();
     await page.locator("#cancel").click();
     await expect(page.locator("#cancel")).not.toBeVisible();
@@ -67,13 +71,8 @@ test.describe("feed sources", () => {
   test("It goes to edit", async ({ page }) => {
     await expect(page.locator("#feed-sourceTitle")).not.toBeVisible();
 
-    await page.route("**/feed-sources*", async (route) => {
-      await route.fulfill({ json: feedSourcesJson2 });
-    });
-
-    await page.route("**/feed-sources/*", async (route) => {
-      await route.fulfill({ json: feedSourcesJson3 });
-    });
+    await awaitDataRoute(page, "**/feed-sources*", feedSourcesJson2);
+    await awaitDataRoute(page, "**/feed-sources/01JBBP48CS9CV80XRWRP8CAETJ", feedSourceSingleJson);
 
     await page.locator("tbody").locator("tr td a").first().click();
     await expect(page.locator("#feed-sourceTitle")).toBeVisible();