Merge mozilla-central to inbound. a=merge CLOSED TREE (91a3bed7) · Commits · The Tor Project / Applications / Tor Browser

.eslintrc.js

+78 −0

Original line number	Diff line number	Diff line
		"use strict";

		const xpcshellTestConfig = require("eslint-plugin-mozilla/lib/configs/xpcshell-test.js");
		const browserTestConfig = require("eslint-plugin-mozilla/lib/configs/browser-test.js");
		const mochitestTestConfig = require("eslint-plugin-mozilla/lib/configs/mochitest-test.js");
		const chromeTestConfig = require("eslint-plugin-mozilla/lib/configs/chrome-test.js");

		/**
		* Some configurations have overrides, which can't be specified within overrides,
		* so we need to remove them.
		*/
		function removeOverrides(config) {
		config = {...config};
		delete config.overrides;
		return config;
		}

		const xpcshellTestPaths = [
		"*/test/unit*/",
		"*/test/xpcshell/",
		];

		const browserTestPaths = [
		"*/test/**/browser/",
		];

		const mochitestTestPaths = [
		"*/test/mochitest/",
		];

		const chromeTestPaths = [
		"*/test/chrome/",
		];

		module.exports = {
		// New rules and configurations should generally be added in
		// tools/lint/eslint/eslint-plugin-mozilla/lib/configs/recommended.js to
		@@ -84,5 +116,51 @@ module.exports = {
		"rules": {
		"no-throw-literal": "off",
		}
		}, {
		...removeOverrides(xpcshellTestConfig),
		"files": xpcshellTestPaths.map(path => `${path}**`),
		"excludedFiles": "devtools/**"
		}, {
		// If it is an xpcshell head file, we turn off global unused variable checks, as it
		// would require searching the other test files to know if they are used or not.
		// This would be expensive and slow, and it isn't worth it for head files.
		// We could get developers to declare as exported, but that doesn't seem worth it.
		"files": xpcshellTestPaths.map(path => `${path}head*.js`),

		"rules": {
		"no-unused-vars": ["error", {
		"args": "none",
		"vars": "local",
		}],
		},
		}, {
		...browserTestConfig,
		"files": browserTestPaths.map(path => `${path}**`),
		"excludedFiles": "devtools/**"
		}, {
		...removeOverrides(mochitestTestConfig),
		"files": mochitestTestPaths.map(path => `${path}**`),
		"excludedFiles": [
		"devtools/**",
		"security/manager/ssl/tests/mochitest/browser/**",
		"testing/mochitest/**",
		],
		}, {
		...removeOverrides(chromeTestConfig),
		"files": chromeTestPaths.map(path => `${path}**`),
		"excludedFiles": [
		"devtools/**",
		],
		}, {
		"env": {
		// Ideally we wouldn't be using the simpletest env here, but our uses of
		// js files mean we pick up everything from the global scope, which could
		// be any one of a number of html files. So we just allow the basics...
		"mozilla/simpletest": true,
		},
		"files": [
		...mochitestTestPaths.map(path => `${path}/*/.js`),
		...chromeTestPaths.map(path => `${path}/*/.js`),
		],
		}]
		};

accessible/tests/browser/.eslintrc.js

+0 −3

Original line number	Diff line number	Diff line
		"use strict";

		module.exports = {
		"extends": [
		"plugin:mozilla/browser-test"
		],
		"rules": {
		"mozilla/no-aArgs": "error",
		"mozilla/reject-importGlobalProperties": ["error", "everything"],

accessible/tests/mochitest/.eslintrc.js

+0 −3

Original line number	Diff line number	Diff line
		"use strict";

		module.exports = {
		"extends": [
		"plugin:mozilla/mochitest-test"
		],
		"rules": {
		// XXX These are rules that are enabled in the recommended configuration, but
		// disabled here due to failures when initially implemented. They should be

browser/base/content/test/chrome/.eslintrc.js

deleted100644 → 0

+0 −7

Original line number	Diff line number	Diff line
		"use strict";

		module.exports = {
		"extends": [
		"plugin:mozilla/chrome-test"
		]
		};

browser/branding/aurora/locales/en-US/brand.dtd

+4 −0

Original line number	Diff line number	Diff line
		@@ -5,5 +5,9 @@
		<!ENTITY brandShorterName "Firefox">
		<!ENTITY brandShortName "Firefox Developer Edition">
		<!ENTITY brandFullName "Firefox Developer Edition">
		<!-- LOCALIZATION NOTE (brandProductName):
		This brand name can be used in messages where the product name needs to
		remain unchanged across different versions (Nightly, Beta, etc.). -->
		<!ENTITY brandProductName "Firefox">
		<!ENTITY vendorShortName "Mozilla">
		<!ENTITY trademarkInfo.part1 " ">