Bug 1366720 - ESLint simpletest and places-overlay environments don't export globals correctly when used outside of mozilla-central. r=mossop
MozReview-Commit-ID: 1Qj63qwjHoo
--- a/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/places-overlay.js
+++ b/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/places-overlay.js
@@ -71,10 +71,10 @@ function mapGlobals(fileGlobals) {
globalObjects[global.name] = global.writable;
}
return globalObjects;
}
module.exports = {
globals: helpers.isMozillaCentralBased() ?
mapGlobals(getScriptGlobals()) :
- helpers.getSavedEnvironmentItems("places-overlay")
+ helpers.getSavedEnvironmentItems("places-overlay").globals
};
--- a/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/simpletest.js
+++ b/tools/lint/eslint/eslint-plugin-mozilla/lib/environments/simpletest.js
@@ -48,10 +48,10 @@ function mapGlobals(fileGlobals) {
globalObjects[global.name] = global.writable;
}
return globalObjects;
}
module.exports = {
globals: helpers.isMozillaCentralBased() ?
mapGlobals(getScriptGlobals()) :
- helpers.getSavedEnvironmentItems("simpletest")
+ helpers.getSavedEnvironmentItems("simpletest").globals
};
--- a/tools/lint/eslint/eslint-plugin-mozilla/package.json
+++ b/tools/lint/eslint/eslint-plugin-mozilla/package.json
@@ -1,11 +1,11 @@
{
"name": "eslint-plugin-mozilla",
- "version": "0.3.1",
+ "version": "0.3.2",
"description": "A collection of rules that help enforce JavaScript coding standard in the Mozilla project.",
"keywords": [
"eslint",
"eslintplugin",
"eslint-plugin",
"mozilla",
"firefox"
],