From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:33 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../browser/browser_application_panel_telemetry-debug-worker.js     | 6 +++++-
 devtools/client/application/test/browser/head.js                    | 6 +++++-
 .../components_application_panel-ManifestIssue.test.js.snap         | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'devtools/client/application/test')

diff --git a/devtools/client/application/test/browser/browser_application_panel_telemetry-debug-worker.js b/devtools/client/application/test/browser/browser_application_panel_telemetry-debug-worker.js
index fe95dabd5e..49f43d47c8 100644
--- a/devtools/client/application/test/browser/browser_application_panel_telemetry-debug-worker.js
+++ b/devtools/client/application/test/browser/browser_application_panel_telemetry-debug-worker.js
@@ -34,7 +34,11 @@ add_task(async function () {
 
   const events = getTelemetryEvents("jsdebugger");
   const openToolboxEvent = events.find(event => event.method == "enter");
-  ok(openToolboxEvent.session_id > 0, "Event has a valid session id");
+  Assert.greater(
+    Number(openToolboxEvent.session_id),
+    0,
+    "Event has a valid session id"
+  );
   is(
     openToolboxEvent.start_state,
     "application",
diff --git a/devtools/client/application/test/browser/head.js b/devtools/client/application/test/browser/head.js
index 6b7e67ff8d..265fd44bf0 100644
--- a/devtools/client/application/test/browser/head.js
+++ b/devtools/client/application/test/browser/head.js
@@ -82,7 +82,11 @@ function checkTelemetryEvent(expectedEvent, objectName = "application") {
   // assert we only got 1 event with a valid session ID
   is(events.length, 1, "There was only 1 event logged");
   const [event] = events;
-  ok(event.session_id > 0, "There is a valid session_id in the event");
+  Assert.greater(
+    Number(event.session_id),
+    0,
+    "There is a valid session_id in the event"
+  );
 
   // assert expected data
   Assert.deepEqual(event, { ...expectedEvent, session_id: event.session_id });
diff --git a/devtools/client/application/test/node/components/manifest/__snapshots__/components_application_panel-ManifestIssue.test.js.snap b/devtools/client/application/test/node/components/manifest/__snapshots__/components_application_panel-ManifestIssue.test.js.snap
index 99e83af1f2..25db8bee3c 100644
--- a/devtools/client/application/test/node/components/manifest/__snapshots__/components_application_panel-ManifestIssue.test.js.snap
+++ b/devtools/client/application/test/node/components/manifest/__snapshots__/components_application_panel-ManifestIssue.test.js.snap
@@ -15,7 +15,7 @@ exports[`ManifestIssue renders the expected snapshot for a warning 1`] = `
   >
     <img
       className="manifest-issue__icon manifest-issue__icon--warning"
-      src="chrome://devtools/skin/images/alert-small.svg"
+      src="resource://devtools-shared-images/alert-small.svg"
     />
   </Localized>
   <span>
-- 
cgit v1.2.3