Bug 1366720 - ESLint simpletest and places-overlay environments don't export globals correctly when used outside of mozilla-central. r=mossop draft
authorMark Banner <standard8@mozilla.com>
Mon, 22 May 2017 11:25:08 +0100
changeset 582691 9c127dd60505b2c3866809cf8afa7bf018bf3cb1
parent 582688 57a57857725d01016eca8e8f9b1f38d7ffc75ce2
child 629823 6ce1a0eb712269afeedf19e23480860b92a3d9f6
push id60140
push userbmo:manishearth@gmail.com
push dateMon, 22 May 2017 22:00:58 +0000
reviewersmossop
bugs1366720
milestone55.0a1
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
tools/lint/eslint/eslint-plugin-mozilla/lib/environments/places-overlay.js
tools/lint/eslint/eslint-plugin-mozilla/lib/environments/simpletest.js
tools/lint/eslint/eslint-plugin-mozilla/package.json
--- 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"
   ],