Bug 1996347 - Newtab move feature gate for tests and automation into activitystream r=whimboo,home-newtab-reviewers,nbarrett

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

UltraBlame original commit: 40b383e82dcdf9b1936267e9987a275423385e1a

Author: marco-c

browser/extensions/newtab/content-src/components/Weather/Weather.jsx

@@ -1345,6 +1345,16 @@ values
 [
 PREF_SYSTEM_SHOW_WEATHER
 ]
+&
+&
+values
+[
+"
+feeds
+.
+weatherfeed
+"
+]
 ;
 const
 experimentValue

browser/extensions/newtab/data/content/activity-stream.bundle.js

@@ -82263,6 +82263,16 @@ values
 [
 PREF_SYSTEM_SHOW_WEATHER
 ]
+&
+&
+values
+[
+"
+feeds
+.
+weatherfeed
+"
+]
 ;
 const
 experimentValue

browser/extensions/newtab/lib/ActivityStream.sys.mjs

@@ -1107,6 +1107,23 @@ urlbar
 placeholderName
 "
 ;
+const
+PREF_SHOULD_AS_INITIALIZE_FEEDS
+=
+"
+browser
+.
+newtabpage
+.
+activity
+-
+stream
+.
+testing
+.
+shouldInitializeFeeds
+"
+;
 export
 const
 WEATHER_OPTIN_REGIONS
@@ -1397,6 +1414,67 @@ value
 )
 ;
 }
+export
+function
+shouldInitializeFeeds
+(
+defaultValue
+=
+true
+)
+{
+/
+/
+For
+tests
+/
+automation
+:
+when
+false
+newtab
+won
+'
+t
+initialize
+/
+/
+select
+feeds
+in
+this
+session
+.
+/
+/
+Flipping
+after
+initialization
+has
+no
+effect
+on
+the
+current
+session
+.
+const
+shouldInitialize
+=
+Services
+.
+prefs
+.
+getBoolPref
+(
+PREF_SHOULD_AS_INITIALIZE_FEEDS
+defaultValue
+)
+;
+return
+shouldInitialize
+;
+}
 function
 useInferredPersonalization
 (
@@ -8097,12 +8175,6 @@ Store
 ;
 this
 .
-feeds
-=
-FEEDS_CONFIG
-;
-this
-.
 _defaultPrefs
 =
 new
@@ -8114,6 +8186,103 @@ PREFS_CONFIG
 )
 ;
 }
+get
+feeds
+(
+)
+{
+if
+(
+shouldInitializeFeeds
+(
+)
+)
+{
+return
+FEEDS_CONFIG
+;
+}
+/
+/
+We
+currently
+make
+excpetions
+for
+topsites
+and
+prefs
+feeds
+/
+/
+because
+they
+currently
+impacts
+tests
+timing
+for
+places
+initialization
+.
+/
+/
+See
+bug
+1999166
+.
+const
+feeds
+=
+new
+Map
+(
+[
+[
+"
+feeds
+.
+system
+.
+topsites
+"
+FEEDS_CONFIG
+.
+get
+(
+"
+feeds
+.
+system
+.
+topsites
+"
+)
+]
+[
+"
+feeds
+.
+prefs
+"
+FEEDS_CONFIG
+.
+get
+(
+"
+feeds
+.
+prefs
+"
+)
+]
+]
+)
+;
+return
+feeds
+;
+}
 init
 (
 )

browser/extensions/newtab/test/unit/content-src/components/Weather.test.jsx

@@ -297,6 +297,13 @@ PREF_SYS_SHOW_WEATHER_OPT_IN
 ]
 :
 false
+"
+feeds
+.
+weatherfeed
+"
+:
+true
 }
 }
 Weather

browser/extensions/newtab/test/unit/utils.js

@@ -780,6 +780,7 @@ value
 getBoolPref
 (
 prefName
+defaultValue
 )
 {
 return
@@ -788,6 +789,7 @@ this
 get
 (
 prefName
+defaultValue
 )
 ;
 }

browser/modules/AboutNewTab.sys.mjs

@@ -245,17 +245,6 @@ before
 change
 "
 ;
-const
-PREF_SHOULD_INITIALIZE
-=
-"
-browser
-.
-newtabpage
-.
-shouldInitialize
-"
-;
 export
 const
 AboutNewTab
@@ -339,59 +328,6 @@ initialized
 return
 ;
 }
-/
-/
-For
-tests
-/
-automation
-:
-when
-false
-newtab
-won
-'
-t
-initialize
-in
-this
-session
-.
-/
-/
-Flipping
-after
-initialization
-has
-no
-effect
-on
-the
-current
-session
-.
-const
-shouldInitialize
-=
-Services
-.
-prefs
-.
-getBoolPref
-(
-PREF_SHOULD_INITIALIZE
-true
-)
-;
-if
-(
-!
-shouldInitialize
-)
-{
-return
-;
-}
 Services
 .
 obs

browser/modules/test/browser/browser.toml

@@ -414,13 +414,6 @@ https_first_disabled
 true
 [
 "
-browser_aboutnewtab_init_gate
-.
-js
-"
-]
-[
-"
 browser_preloading_tab_moving
 .
 js