This repository has been archived by the owner on Feb 29, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 112
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3062 from k88hudson/snippets-test-patch
tests(mc): #3056 Patch for pine to disable snippets in tests
- Loading branch information
Showing
1 changed file
with
33 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| diff --git a/layout/tools/reftest/reftest-preferences.js b/layout/tools/reftest/reftest-preferences.js | ||
| --- a/layout/tools/reftest/reftest-preferences.js | ||
| +++ b/layout/tools/reftest/reftest-preferences.js | ||
| @@ -144,5 +144,6 @@ user_pref("media.openUnsupportedTypeWith | ||
| // consumer automation; not vendor testing. | ||
| user_pref("marionette.prefs.recommended", false); | ||
|
|
||
| -// Make sure we don't reach out to the network with pocket | ||
| +// Make sure we don't reach out to the network with pocket or snippets | ||
| user_pref("browser.newtabpage.activity-stream.feeds.section.topstories", false); | ||
| +user_pref("browser.newtabpage.activity-stream.feeds.snippets", false); | ||
| diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js | ||
| --- a/testing/profiles/prefs_general.js | ||
| +++ b/testing/profiles/prefs_general.js | ||
| @@ -305,6 +305,7 @@ user_pref("browser.aboutHomeSnippets.upd | ||
| user_pref("browser.newtabpage.activity-stream.default.sites", ""); | ||
| user_pref("browser.newtabpage.activity-stream.telemetry", false); | ||
| user_pref("browser.newtabpage.activity-stream.feeds.section.topstories", false); | ||
| +user_pref("browser.newtabpage.activity-stream.feeds.snippets", false); | ||
|
|
||
| // Don't fetch directory tiles data from real servers | ||
| user_pref("browser.newtabpage.directory.source", 'data:application/json,{"testing":1}'); | ||
| diff --git a/testing/talos/talos/config.py b/testing/talos/talos/config.py | ||
| --- a/testing/talos/talos/config.py | ||
| +++ b/testing/talos/talos/config.py | ||
| @@ -100,6 +100,7 @@ DEFAULTS = dict( | ||
| 'browser.newtabpage.activity-stream.default.sites': '', | ||
| 'browser.newtabpage.activity-stream.telemetry': False, | ||
| 'browser.newtabpage.activity-stream.feeds.section.topstories': False, | ||
| + 'browser.newtabpage.activity-stream.feeds.snippets': False, | ||
| 'browser.newtabpage.directory.source': | ||
| '${webserver}/directoryLinks.json', | ||
| 'browser.newtabpage.introShown': True, |