From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:35:49 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../search/test/marionette/manifest.toml           |  2 +
 .../search/test/marionette/telemetry/manifest.toml |  4 +
 .../marionette/telemetry/test_ping_submitted.py    | 89 ++++++++++++++++++++++
 3 files changed, 95 insertions(+)
 create mode 100644 browser/components/search/test/marionette/telemetry/manifest.toml
 create mode 100644 browser/components/search/test/marionette/telemetry/test_ping_submitted.py

(limited to 'browser/components/search/test/marionette')

diff --git a/browser/components/search/test/marionette/manifest.toml b/browser/components/search/test/marionette/manifest.toml
index 152442bc5b..9cc88e9f84 100644
--- a/browser/components/search/test/marionette/manifest.toml
+++ b/browser/components/search/test/marionette/manifest.toml
@@ -1,4 +1,6 @@
 [DEFAULT]
 run-if = ["buildapp == 'browser'"]
 
+["include:telemetry/manifest.toml"]
+
 ["test_engines_on_restart.py"]
diff --git a/browser/components/search/test/marionette/telemetry/manifest.toml b/browser/components/search/test/marionette/telemetry/manifest.toml
new file mode 100644
index 0000000000..1fe35945c9
--- /dev/null
+++ b/browser/components/search/test/marionette/telemetry/manifest.toml
@@ -0,0 +1,4 @@
+[DEFAULT]
+run-if = ["buildapp == 'browser'"]
+
+["test_ping_submitted.py"]
diff --git a/browser/components/search/test/marionette/telemetry/test_ping_submitted.py b/browser/components/search/test/marionette/telemetry/test_ping_submitted.py
new file mode 100644
index 0000000000..cefe2d72d1
--- /dev/null
+++ b/browser/components/search/test/marionette/telemetry/test_ping_submitted.py
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from marionette_driver import Wait
+from marionette_harness.marionette_test import MarionetteTestCase
+
+
+class TestPingSubmitted(MarionetteTestCase):
+    def setUp(self):
+        super(TestPingSubmitted, self).setUp()
+
+        self.marionette.set_context(self.marionette.CONTEXT_CHROME)
+
+        self.marionette.enforce_gecko_prefs(
+            {
+                "datareporting.healthreport.uploadEnabled": True,
+                "telemetry.fog.test.localhost_port": 3000,
+                "browser.search.log": True,
+            }
+        )
+        # The categorization ping is submitted on startup. If anything delays
+        # its initialization, turning the preference on and immediately
+        # attaching a categorization event could result in the ping being
+        # submitted after the test event is reported but before the browser
+        # restarts.
+        script = """
+            let [outerResolve] = arguments;
+            (async () => {
+                if (!Services.prefs.getBoolPref("browser.search.serpEventTelemetryCategorization.enabled")) {
+                    let inited = new Promise(innerResolve => {
+                    Services.obs.addObserver(function callback() {
+                        Services.obs.removeObserver(callback, "categorization-recorder-init");
+                        innerResolve();
+                    }, "categorization-recorder-init");
+                    });
+                    Services.prefs.setBoolPref("browser.search.serpEventTelemetryCategorization.enabled", true);
+                    await inited;
+                }
+            })().then(outerResolve);
+        """
+        self.marionette.execute_async_script(script)
+
+    def test_ping_submit_on_start(self):
+        # Record an event for the ping to eventually submit.
+        self.marionette.execute_script(
+            """
+        Glean.serp.categorization.record({
+            organic_category: "3",
+            organic_num_domains: "1",
+            organic_num_inconclusive: "0",
+            organic_num_unknown: "0",
+            sponsored_category: "4",
+            sponsored_num_domains: "2",
+            sponsored_num_inconclusive: "0",
+            sponsored_num_unknown: "0",
+            mappings_version: "1",
+            app_version: "124",
+            channel: "nightly",
+            region: "US",
+            partner_code: "ff",
+            provider: "example",
+            tagged: "true",
+            num_ads_clicked: "0",
+            num_ads_visible: "2",
+        });
+            """
+        )
+
+        Wait(self.marionette, timeout=60).until(
+            lambda _: self.marionette.execute_script(
+                """
+            return (Glean.serp.categorization.testGetValue()?.length ?? 0) == 1;
+                """
+            ),
+            message="Should have recorded a SERP categorization event before restart.",
+        )
+
+        self.marionette.restart(clean=False, in_app=True)
+
+        Wait(self.marionette, timeout=60).until(
+            lambda _: self.marionette.execute_script(
+                """
+            return (Glean.serp.categorization.testGetValue()?.length ?? 0) == 0;
+                """
+            ),
+            message="SERP categorization should have been sent some time after restart.",
+        )
-- 
cgit v1.2.3