From d4d273fa1de5369aa306ff0e3486d9981b3d7e14 Mon Sep 17 00:00:00 2001
From: Beth Rennie <beth@brennie.ca>
Date: Fri, 9 May 2025 17:59:45 +0000
Subject: [PATCH] Bug 1965387 - Add features in NimbusTestUtils.setupTest
 r=nimbus-reviewers,relud

Differential Revision: https://phabricator.services.mozilla.com/D248560
---
 toolkit/components/nimbus/test/NimbusTestUtils.sys.mjs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/toolkit/components/nimbus/test/NimbusTestUtils.sys.mjs b/toolkit/components/nimbus/test/NimbusTestUtils.sys.mjs
index ff03899c2ad1..406f1a541f80 100644
--- a/toolkit/components/nimbus/test/NimbusTestUtils.sys.mjs
+++ b/toolkit/components/nimbus/test/NimbusTestUtils.sys.mjs
@@ -726,9 +726,15 @@ export const NimbusTestUtils = {
     experiments,
     secureExperiments,
     clearTelemetry = false,
+    features,
   } = {}) {
     const sandbox = lazy.sinon.createSandbox();
 
+    let cleanupFeatures = null;
+    if (Array.isArray(features)) {
+      cleanupFeatures = NimbusTestUtils.addTestFeatures(...features);
+    }
+
     const store = NimbusTestUtils.stubs.store(storePath);
     const manager = NimbusTestUtils.stubs.manager(store);
     const loader = NimbusTestUtils.stubs.rsLoader(manager);
@@ -751,6 +757,10 @@ export const NimbusTestUtils = {
         ExperimentAPI._resetForTests();
         sandbox.restore();
 
+        if (cleanupFeatures) {
+          cleanupFeatures();
+        }
+
         if (clearTelemetry) {
           Services.fog.testResetFOG();
           Services.telemetry.clearEvents();