Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit f6f68d8

Browse files
committed
Bug 1938452 - Move newtab tests to browser/extensions/newtab. r=home-newtab-reviewers,omc-reviewers,frontend-codestyle-reviewers,pdahiya,thecount
This doesn't move test_AboutNewTab.js, as this test exercises the AboutNewTab module under browser/modules/ and the AboutNewTabService component under browser/components/newtab. Differential Revision: https://phabricator.services.mozilla.com/D233873
1 parent 6f1163d commit f6f68d8

File tree

155 files changed

+76
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+76
-68
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ devtools/**/node_modules/
7777
tools/browsertime/node_modules/
7878
tools/lint/eslint/eslint-plugin-mozilla/node_modules/
7979
browser/components/asrouter/node_modules/
80-
browser/components/newtab/node_modules/
8180
browser/components/aboutwelcome/node_modules/
81+
browser/extensions/newtab/node_modules/
8282
tools/ts/node_modules/
8383
testing/xpcshell/moz-http2/node_modules/
8484

8585
# Ignore newtab component build assets
86-
browser/components/newtab/logs/
86+
browser/extensions/newtab/logs/
8787

8888
# Ignore about:welcome component build assets
8989
browser/components/aboutwelcome/logs/

.hgignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@
7373
^tools/browsertime/node_modules/
7474
^tools/lint/eslint/eslint-plugin-mozilla/node_modules/
7575
^browser/components/asrouter/node_modules/
76-
^browser/components/newtab/node_modules/
7776
^browser/components/aboutwelcome/node_modules/
77+
^browser/extensions/newtab/node_modules/
7878
^tools/ts/node_modules/
7979
^testing/xpcshell/moz-http2/node_modules/
8080

8181
# Ignore newtab component build assets
82-
^browser/components/newtab/logs/
82+
^browser/extensions/newtab/logs/
8383

8484
# Ignore about:welcome component build assets
8585
^browser/components/aboutwelcome/logs/

.prettierignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,8 +1019,8 @@ browser/components/pocket/content/panels/js/main.bundle.js
10191019
!browser/components/storybook/.storybook/*.js
10201020

10211021
# Ignore newtab files
1022-
browser/components/newtab/data/
1023-
browser/components/newtab/logs/
1022+
browser/extensions/newtab/data/
1023+
browser/extensions/newtab/logs/
10241024

10251025
# Ignore about:welcome files
10261026
browser/components/aboutwelcome/logs/
@@ -1466,9 +1466,9 @@ browser/components/asrouter/content-src/schemas/BackgroundTaskMessagingExperimen
14661466
browser/components/asrouter/content-src/schemas/MessagingExperiment.schema.json
14671467
browser/components/asrouter/tests/InflightAssetsMessageProvider.sys.mjs
14681468
browser/components/asrouter/tests/NimbusRolloutMessageProvider.sys.mjs
1469-
browser/components/newtab/logs/
1470-
browser/components/newtab/node_modules/
14711469
browser/components/storybook/storybook-static/
1470+
browser/extensions/newtab/logs/
1471+
browser/extensions/newtab/node_modules/
14721472
browser/locales/l10n-changesets.json
14731473
browser/locales/l10n-onchange-changesets.json
14741474
devtools/client/aboutdebugging/test/jest/node_modules/

browser/components/asrouter/tests/browser/browser.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[DEFAULT]
22
support-files = [
3-
"../../../newtab/test/browser/blue_page.html",
3+
"../../../../extensions/newtab/test/browser/blue_page.html",
44
"head.js",
55
]
66

browser/components/asrouter/tests/browser/browser_asrouter_cfr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ add_task(async function test_onLocationChange_cb() {
585585
let count = 0;
586586
const triggerHandler = () => ++count;
587587
const TEST_URL =
588-
"https://example.com/browser/browser/components/newtab/test/browser/blue_page.html";
588+
"https://example.com/browser/browser/extensions/newtab/test/browser/blue_page.html";
589589
const browser = gBrowser.selectedBrowser;
590590

591591
await ASRouterTriggerListeners.get("openURL").init(triggerHandler, [

browser/components/asrouter/tests/unit/ASRouterStorage.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ASRouterStorage } from "modules/ASRouterStorage.sys.mjs";
2-
import { GlobalOverrider } from "../../../newtab/test/unit/utils";
2+
import { GlobalOverrider } from "tests/unit/utils";
33

44
let overrider = new GlobalOverrider();
55

browser/components/newtab/moz.build

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@
77
with Files("**"):
88
BUG_COMPONENT = ("Firefox", "New Tab Page")
99

10-
BROWSER_CHROME_MANIFESTS += [
11-
"test/browser/abouthomecache/browser.toml",
12-
"test/browser/browser.toml",
13-
]
14-
15-
XPCSHELL_TESTS_MANIFESTS += [
16-
"test/xpcshell/xpcshell.toml",
17-
]
18-
1910
XPIDL_SOURCES += [
2011
"nsIAboutNewTabService.idl",
2112
]
@@ -29,3 +20,7 @@ EXTRA_JS_MODULES += [
2920
XPCOM_MANIFESTS += [
3021
"components.conf",
3122
]
23+
24+
XPCSHELL_TESTS_MANIFESTS += [
25+
"test/xpcshell/xpcshell.toml",
26+
]

browser/components/newtab/test/browser/annotation_second.html

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,5 @@
11
[DEFAULT]
22
firefox-appdir = "browser"
33
skip-if = ["os == 'android'"] # bug 1730213
4-
prefs = [
5-
"browser.startup.homepage.abouthome_cache.enabled=true",
6-
"browser.startup.homepage.abouthome_cache.testing=true",
7-
]
8-
9-
["test_AboutHomeStartupCacheChild.js"]
10-
11-
["test_AboutHomeStartupCacheWorker.js"]
12-
support-files = ["topstories.json"]
13-
skip-if = ["socketprocess_networking"] # Bug 1759035
144

155
["test_AboutNewTab.js"]
16-
17-
["test_AdsFeed.js"]
18-
19-
["test_FaviconFeed.js"]
20-
support-files = ["favicon.png"]
21-
22-
["test_HighlightsFeed.js"]
23-
24-
["test_PlacesFeed.js"]
25-
26-
["test_Store.js"]
27-
28-
["test_TelemetryFeed.js"]
29-
support-files = ["../schemas/*.schema.json"]
30-
31-
["test_TopSitesFeed.js"]
32-
33-
["test_TopSitesFeed_glean.js"]
34-
35-
["test_WallpaperFeed.js"]
36-
tags = "remote-settings"
37-
38-
["test_WeatherFeed.js"]

browser/components/newtab/karma.mc.config.js renamed to browser/extensions/newtab/karma.mc.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,11 @@ module.exports = function (config) {
300300
],
301301
[
302302
new RegExp("^resource:///modules/asrouter/"),
303-
path.join(__dirname, "../asrouter/modules/"),
303+
path.join(__dirname, "../../components/asrouter/modules/"),
304304
],
305305
[
306306
new RegExp("^resource:///modules/topsites/"),
307-
path.join(__dirname, "../topsites/"),
307+
path.join(__dirname, "../../components/topsites/"),
308308
],
309309
[
310310
new RegExp("^resource://gre/modules/SearchShortcuts.sys.mjs"),

0 commit comments

Comments
 (0)