tor-browser

commit cd992e8e90742dc0680d041448a70f007a17bb4f
parent 099ce56a644fe786ea963787ea23258f4dc67f64
Author: scottdowne <sdowne@mozilla.com>
Date:   Tue,  7 Oct 2025 20:54:58 +0000

Bug 1993104 - Newtab fixing on demand spoc updates r=nbarrett

Differential Revision: https://phabricator.services.mozilla.com/D267870

Diffstat:
M
browser/extensions/newtab/lib/DiscoveryStreamFeed.sys.mjs
 | 
2
+-
M
browser/extensions/newtab/test/unit/lib/DiscoveryStreamFeed.test.js
 | 
12
++++++++++++

2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/browser/extensions/newtab/lib/DiscoveryStreamFeed.sys.mjs b/browser/extensions/newtab/lib/DiscoveryStreamFeed.sys.mjs
@@ -532,7 +532,7 @@ export class DiscoveryStreamFeed {
       const spocsOnDemandConfig = values.trainhopConfig?.spocsOnDemand || {};
       const spocsOnDemand =
         spocsOnDemandConfig.enabled || values[PREF_SPOCS_CACHE_ONDEMAND];
-      this._spocsOnDemand = spocsOnDemand;
+      this._spocsOnDemand = this.showSponsoredStories && spocsOnDemand;
     }
 
     return this._spocsOnDemand;
diff --git a/browser/extensions/newtab/test/unit/lib/DiscoveryStreamFeed.test.js b/browser/extensions/newtab/test/unit/lib/DiscoveryStreamFeed.test.js
@@ -2815,6 +2815,8 @@ describe("DiscoveryStreamFeed", () => {
         Prefs: {
           values: {
             "discoverystream.spocs.cacheTimeout": 1,
+            showSponsored: true,
+            "system.showSponsored": true,
           },
         },
       });
@@ -2828,6 +2830,8 @@ describe("DiscoveryStreamFeed", () => {
         Prefs: {
           values: {
             "discoverystream.spocs.cacheTimeout": 31,
+            showSponsored: true,
+            "system.showSponsored": true,
           },
         },
       });
@@ -2841,6 +2845,8 @@ describe("DiscoveryStreamFeed", () => {
         Prefs: {
           values: {
             "discoverystream.spocs.cacheTimeout": 20,
+            showSponsored: true,
+            "system.showSponsored": true,
           },
         },
       });
@@ -2855,6 +2861,8 @@ describe("DiscoveryStreamFeed", () => {
           values: {
             "discoverystream.spocs.onDemand": true,
             "discoverystream.spocs.cacheTimeout": 4,
+            showSponsored: true,
+            "system.showSponsored": true,
           },
         },
       });
@@ -2869,6 +2877,8 @@ describe("DiscoveryStreamFeed", () => {
           values: {
             "discoverystream.spocs.onDemand": true,
             "discoverystream.spocs.cacheTimeout": 31,
+            showSponsored: true,
+            "system.showSponsored": true,
           },
         },
       });
@@ -2883,6 +2893,8 @@ describe("DiscoveryStreamFeed", () => {
           values: {
             "discoverystream.spocs.onDemand": true,
             "discoverystream.spocs.cacheTimeout": 1,
+            showSponsored: true,
+            "system.showSponsored": true,
           },
         },
       });