New: Jest environment (fixes #3212)

eslint · Jul 31, 2015 · c9b7096 · c9b7096
1 parent 3cbc5b6
commit c9b7096
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/conf/environments.js b/conf/environments.js
@@ -38,6 +38,9 @@ module.exports = {
     jasmine: {
         globals: globals.jasmine
     },
+    jest: {
+        globals: globals.jest
+    },
     phantomjs: {
         globals: globals.phantomjs
     },

diff --git a/docs/user-guide/configuring.md b/docs/user-guide/configuring.md
@@ -100,6 +100,7 @@ An environment defines global variables that are predefined. The available envir
 * `amd` - defines `require()` and `define()` as global variables as per the [amd](https://github.com/amdjs/amdjs-api/wiki/AMD) spec.
 * `mocha` - adds all of the Mocha testing global variables.
 * `jasmine` - adds all of the Jasmine testing global variables for version 1.3 and 2.0.
+* `jest` - Jest global variables.
 * `phantomjs` - PhantomJS global variables.
 * `qunit` - QUnit global variables.
 * `jquery` - jQuery global variables.

diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "espree": "^2.2.0",
     "estraverse": "^4.1.0",
     "estraverse-fb": "^1.3.1",
-    "globals": "^8.2.0",
+    "globals": "^8.3.0",
     "inquirer": "^0.8.2",
     "is-my-json-valid": "^2.10.0",
     "js-yaml": "^3.2.5",