WebKit · flashdesignory · Aug 21, 2024 · Aug 21, 2024 · Aug 21, 2024 · Aug 21, 2024
diff --git a/resources/benchmark-runner.mjs b/resources/benchmark-runner.mjs
@@ -1,5 +1,5 @@
 import { Metric } from "./metric.mjs";
-import { params } from "./params.mjs";
+import { params } from "./shared/params.mjs";
 import { SUITE_RUNNER_LOOKUP } from "./suite-runner.mjs";
 
 const performance = globalThis.performance;

diff --git a/resources/developer-mode.mjs b/resources/developer-mode.mjs
@@ -1,5 +1,5 @@
 import { Suites, Tags } from "./tests.mjs";
-import { params, defaultParams } from "./params.mjs";
+import { params, defaultParams } from "./shared/params.mjs";
 
 export function createDeveloperModeContainer() {
     const container = document.createElement("div");

diff --git a/resources/main.mjs b/resources/main.mjs
@@ -2,7 +2,7 @@ import { BenchmarkRunner } from "./benchmark-runner.mjs";
 import * as Statistics from "./statistics.mjs";
 import { Suites } from "./tests.mjs";
 import { renderMetricView } from "./metric-ui.mjs";
-import { params } from "./params.mjs";
+import { params } from "./shared/params.mjs";
 import { createDeveloperModeContainer } from "./developer-mode.mjs";
 
 // FIXME(camillobruni): Add base class
@@ -94,7 +94,7 @@ class MainBenchmarkClient {
 
         const enabledSuites = Suites.filter((suite) => !suite.disabled);
         const totalSubtestsCount = enabledSuites.reduce((testsCount, suite) => {
-            return testsCount + suite.tests.length;
+            return testsCount + (suite.tests?.length ?? suite.config?.steps);
         }, 0);
         this.stepCount = params.iterationCount * totalSubtestsCount;
         this._progressCompleted.max = this.stepCount;

diff --git a/resources/newssite/news-next/dist/404.html b/resources/newssite/news-next/dist/404.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="./_next/static/css/a0dca1379a01e5cf.css" as="style"/><link rel="stylesheet" href="./_next/static/css/a0dca1379a01e5cf.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="./_next/static/chunks/webpack-e50e9853db18b759.js" defer=""></script><script src="./_next/static/chunks/framework-2c79e2a64abdb08b.js" defer=""></script><script src="./_next/static/chunks/main-2ba37e62325cc71b.js" defer=""></script><script src="./_next/static/chunks/pages/_app-77983e68be50f72a.js" defer=""></script><script src="./_next/static/chunks/pages/_error-54de1933a164a1ff.js" defer=""></script><script src="./_next/static/ofW8d8vHz4HS9u6cDJv4X/_buildManifest.js" defer=""></script><script src="./_next/static/ofW8d8vHz4HS9u6cDJv4X/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><div id="settings-container"></div><div id="notifications-container"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"ofW8d8vHz4HS9u6cDJv4X","assetPrefix":".","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="./_next/static/css/a0dca1379a01e5cf.css" as="style"/><link rel="stylesheet" href="./_next/static/css/a0dca1379a01e5cf.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="./_next/static/chunks/webpack-e50e9853db18b759.js" defer=""></script><script src="./_next/static/chunks/framework-2c79e2a64abdb08b.js" defer=""></script><script src="./_next/static/chunks/main-2ba37e62325cc71b.js" defer=""></script><script src="./_next/static/chunks/pages/_app-77983e68be50f72a.js" defer=""></script><script src="./_next/static/chunks/pages/_error-54de1933a164a1ff.js" defer=""></script><script src="./_next/static/XRziDoLlUPkrw2MQfjPik/_buildManifest.js" defer=""></script><script src="./_next/static/XRziDoLlUPkrw2MQfjPik/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><div id="settings-container"></div><div id="notifications-container"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"XRziDoLlUPkrw2MQfjPik","assetPrefix":".","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
diff --git a/...c/ofW8d8vHz4HS9u6cDJv4X/_buildManifest.js → ...c/XRziDoLlUPkrw2MQfjPik/_buildManifest.js b/...c/ofW8d8vHz4HS9u6cDJv4X/_buildManifest.js → ...c/XRziDoLlUPkrw2MQfjPik/_buildManifest.js
diff --git a/...tic/ofW8d8vHz4HS9u6cDJv4X/_ssgManifest.js → ...tic/XRziDoLlUPkrw2MQfjPik/_ssgManifest.js b/...tic/ofW8d8vHz4HS9u6cDJv4X/_ssgManifest.js → ...tic/XRziDoLlUPkrw2MQfjPik/_ssgManifest.js
diff --git a/resources/newssite/news-next/dist/_next/static/chunks/pages/index-2c799f1d9400a895.js b/resources/newssite/news-next/dist/_next/static/chunks/pages/index-2c799f1d9400a895.js
diff --git a/resources/newssite/news-next/dist/_next/static/chunks/pages/index-7fd4a7c8e35958df.js b/resources/newssite/news-next/dist/_next/static/chunks/pages/index-7fd4a7c8e35958df.js
diff --git a/resources/newssite/news-next/dist/index.html b/resources/newssite/news-next/dist/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="./_next/static/css/a0dca1379a01e5cf.css" as="style"/><link rel="stylesheet" href="./_next/static/css/a0dca1379a01e5cf.css" data-n-g=""/><link rel="preload" href="./_next/static/css/2cf5163b53bb0adb.css" as="style"/><link rel="stylesheet" href="./_next/static/css/2cf5163b53bb0adb.css" data-n-p=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="./_next/static/chunks/webpack-e50e9853db18b759.js" defer=""></script><script src="./_next/static/chunks/framework-2c79e2a64abdb08b.js" defer=""></script><script src="./_next/static/chunks/main-2ba37e62325cc71b.js" defer=""></script><script src="./_next/static/chunks/pages/_app-77983e68be50f72a.js" defer=""></script><script src="./_next/static/chunks/743-fd706aeabb7828e3.js" defer=""></script><script src="./_next/static/chunks/pages/index-7fd4a7c8e35958df.js" defer=""></script><script src="./_next/static/ofW8d8vHz4HS9u6cDJv4X/_buildManifest.js" defer=""></script><script src="./_next/static/ofW8d8vHz4HS9u6cDJv4X/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><div id="settings-container"></div><div id="notifications-container"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{}},"page":"/","query":{},"buildId":"ofW8d8vHz4HS9u6cDJv4X","assetPrefix":".","nextExport":true,"autoExport":true,"isFallback":false,"scriptLoader":[]}</script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="./_next/static/css/a0dca1379a01e5cf.css" as="style"/><link rel="stylesheet" href="./_next/static/css/a0dca1379a01e5cf.css" data-n-g=""/><link rel="preload" href="./_next/static/css/2cf5163b53bb0adb.css" as="style"/><link rel="stylesheet" href="./_next/static/css/2cf5163b53bb0adb.css" data-n-p=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="./_next/static/chunks/webpack-e50e9853db18b759.js" defer=""></script><script src="./_next/static/chunks/framework-2c79e2a64abdb08b.js" defer=""></script><script src="./_next/static/chunks/main-2ba37e62325cc71b.js" defer=""></script><script src="./_next/static/chunks/pages/_app-77983e68be50f72a.js" defer=""></script><script src="./_next/static/chunks/743-fd706aeabb7828e3.js" defer=""></script><script src="./_next/static/chunks/pages/index-2c799f1d9400a895.js" defer=""></script><script src="./_next/static/XRziDoLlUPkrw2MQfjPik/_buildManifest.js" defer=""></script><script src="./_next/static/XRziDoLlUPkrw2MQfjPik/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><div id="settings-container"></div><div id="notifications-container"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{}},"page":"/","query":{},"buildId":"XRziDoLlUPkrw2MQfjPik","assetPrefix":".","nextExport":true,"autoExport":true,"isFallback":false,"scriptLoader":[]}</script></body></html>
diff --git a/resources/newssite/news-next/package-lock.json b/resources/newssite/news-next/package-lock.json
diff --git a/resources/newssite/news-next/package.json b/resources/newssite/news-next/package.json
@@ -20,6 +20,7 @@
         "react-dom": "18.2.0",
         "react-router-dom": "^6.11.1",
         "react-router-hash-link": "^2.4.3",
+        "speedometer-utils": "../../shared",
         "uuid": "^9.0.0"
     }
 }
diff --git a/resources/newssite/news-next/src/pages/index.js b/resources/newssite/news-next/src/pages/index.js
@@ -1,10 +1,19 @@
-import React from "react";
+import { useEffect } from "react";
 import { HashRouter as Router, Routes, Route } from "react-router-dom";
 import Page from "@/partials/page/page";
 import Head from "next/head";
 import { DataContextProvider } from "@/context/data-context";
+import { connectToBenchmark } from "speedometer-utils/workload-testing-utils.mjs";
+import { getBenchmarkSuitesManager } from "@/workload-test.mjs";
 
 export default function App() {
+    // Using 'useLayoutEffect' here, since this will connect the workload after all DOM mutations happened.
+    // This ensures that all elemetns are in the DOM, prior to signaling to the Benchmark that the workload is ready to run a test suite.
+    useEffect(() => {
+        const disconnect = connectToBenchmark(getBenchmarkSuitesManager(), "news-next", 1);
+        return disconnect;
+    }, []);
+
     return (
         <>
             <Head>

diff --git a/resources/newssite/news-next/src/workload-test.mjs b/resources/newssite/news-next/src/workload-test.mjs
@@ -0,0 +1,41 @@
+import { BenchmarkTestStep, BenchmarkTestSuite, BenchmarkSuitesManager, forceLayout, getElement } from "speedometer-utils/workload-testing-utils.mjs";
+
+export function getBenchmarkSuitesManager() {
+    return new BenchmarkSuitesManager(window.name, [
+        new BenchmarkTestSuite("default", [
+            new BenchmarkTestStep("Navigate-to-US-page", () => {
+                for (let i = 0; i < 25; i++) {
+                    getElement("#navbar-dropdown-toggle").click();
+                    forceLayout();
+                    getElement("#navbar-dropdown-toggle").click();
+                    forceLayout();
+                }
+
+                getElement("#navbar-navlist-us-link").click();
+                forceLayout();
+            }),
+            new BenchmarkTestStep("Navigate-to-World-page", () => {
+                for (let i = 0; i < 25; i++) {
+                    getElement("#navbar-dropdown-toggle").click();
+                    forceLayout();
+                    getElement("#navbar-dropdown-toggle").click();
+                    forceLayout();
+                }
+
+                getElement("#navbar-navlist-world-link").click();
+                forceLayout();
+            }),
+            new BenchmarkTestStep("Navigate-to-Politics-page", () => {
+                for (let i = 0; i < 25; i++) {
+                    getElement("#navbar-dropdown-toggle").click();
+                    forceLayout();
+                    getElement("#navbar-dropdown-toggle").click();
+                    forceLayout();
+                }
+
+                getElement("#navbar-navlist-politics-link").click();
+                forceLayout();
+            }),
+        ]),
+    ]);
+}
diff --git a/resources/shared/package.json b/resources/shared/package.json
@@ -0,0 +1,5 @@
+{
+    "name": "speedometer-utils",
+    "version": "1.0.0",
+    "description": "Utility files for Speedometer & Workloads"
+}
diff --git a/resources/params.mjs → resources/shared/params.mjs b/resources/params.mjs → resources/shared/params.mjs
@@ -1,4 +1,4 @@
-class Params {
+export class Params {
     viewport = {
         width: 800,
         height: 600,
@@ -146,21 +146,28 @@ class Params {
         return shuffleSeed;
     }
 
-    toSearchParams() {
+    toSearchParams(forRemote = false) {
         const rawParams = { ...this };
         rawParams["viewport"] = `${this.viewport.width}x${this.viewport.height}`;
+
+        // Only returning params that are useful for the workload.
+        // Both, 'suites' and 'tags', are specific to the debug menu.
+        if (forRemote) {
+            delete rawParams["suites"];
+            delete rawParams["tags"];
+        }
+
         return new URLSearchParams(rawParams).toString();
     }
 }
 
 export const defaultParams = new Params();
 
-const searchParams = new URLSearchParams(window.location.search);
+const searchParams = new URLSearchParams(typeof window !== "undefined" ? window.location.search : undefined);
 let maybeCustomParams = new Params();
 try {
     maybeCustomParams = new Params(searchParams);
 } catch (e) {
     console.error("Invalid URL Param", e, "\nUsing defaults as fallback:", maybeCustomParams);
-    alert(`Invalid URL Param: ${e}`);
 }
 export const params = maybeCustomParams;
diff --git a/resources/test-invoker.mjs → resources/shared/test-invoker.mjs b/resources/test-invoker.mjs → resources/shared/test-invoker.mjs
@@ -15,8 +15,8 @@ export class TimerTestInvoker extends TestInvoker {
                 setTimeout(() => {
                     this._asyncCallback();
                     requestAnimationFrame(async () => {
-                        await this._reportCallback();
-                        resolve();
+                        const result = await this._reportCallback();
+                        resolve(result);
                     });
                 }, 0);
             }, this._params.waitBeforeSync);
@@ -40,8 +40,8 @@ export class RAFTestInvoker extends TestInvoker {
             setTimeout(() => {
                 this._asyncCallback();
                 setTimeout(async () => {
-                    await this._reportCallback();
-                    resolve();
+                    const result = await this._reportCallback();
+                    resolve(result);
                 }, 0);
             }, 0);
         });

diff --git a/resources/test-runner.mjs → resources/shared/test-runner.mjs b/resources/test-runner.mjs → resources/shared/test-runner.mjs