Merge branch 'master' into mauriciosoares-patch-2

docs/api/mount.md

@@ -180,7 +180,7 @@ Returns whether or not any of the nodes in the wrapper pass the provided predica
 #### [`every(selector) => Boolean`](/docs/api/ReactWrapper/every.md)
 Returns whether or not all of the nodes in the wrapper match the provided selector.
 
-#### [`everyWhere(selector) => Boolean`](/docs/api/ReactWrapper/everyWhere.md)
+#### [`everyWhere(predicate) => Boolean`](/docs/api/ReactWrapper/everyWhere.md)
 Returns whether or not any of the nodes in the wrapper pass the provided predicate function.
 
 #### [`ref(refName) => ReactWrapper`](/docs/api/ReactWrapper/ref.md)

docs/api/shallow.md

@@ -178,5 +178,5 @@ Returns whether or not any of the nodes in the wrapper pass the provided predica
 #### [`every(selector) => Boolean`](/docs/api/ShallowWrapper/every.md)
 Returns whether or not all of the nodes in the wrapper match the provided selector.
 
-#### [`everyWhere(selector) => Boolean`](/docs/api/ShallowWrapper/everyWhere.md)
+#### [`everyWhere(predicate) => Boolean`](/docs/api/ShallowWrapper/everyWhere.md)
 Returns whether or not all of the nodes in the wrapper pass the provided predicate function.

docs/guides/jest.md

@@ -1,6 +1,6 @@
 # Using Jest with Enzyme
 
-If you are using Jest with enzyme and using Jest's "automocking" feature, you will need to mark 
+If you are using Jest with enzyme and using Jest's "automocking" feature, you will need to mark
 several modules to be unmocked in your `package.json`:
 
 ```js
@@ -16,7 +16,6 @@ several modules to be unmocked in your `package.json`:
     "enzyme",
     "cheerio",
     "htmlparser2",
-    "underscore",
     "lodash",
     "domhandler",
     "object.assign",

docs/guides/karma.md

@@ -1,7 +1,7 @@
 # Using Enzyme with Karma
 
 Karma is a popular test runner that can run tests in browser environments. Enzyme is compatible with
-enzyme, but often requires a little bit of configuration.
+Karma, but often requires a little bit of configuration.
 
 This configuration largely depends on which plugins you are using to bundle your JavaScript code.  In
 the case of Browserify or Webpack, see the below documentation in order to get these up and running.

package.json

@@ -51,9 +51,9 @@
   "dependencies": {
     "cheerio": "^0.20.0",
     "is-subset": "^0.1.1",
+    "lodash": "^4.0.0",
     "object.assign": "^4.0.3",
-    "object.values": "^1.0.3",
-    "underscore": "^1.8.3"
+    "object.values": "^1.0.3"
   },
   "devDependencies": {
     "babel-cli": "^6.3.17",

src/Debug.js

@@ -13,7 +13,9 @@ import {
 import {
   propsOfNode,
 } from './Utils';
-import { without, escape, compact } from 'underscore';
+import without from 'lodash/without';
+import escape from 'lodash/escape';
+import compact from 'lodash/compact';
 import { REACT013, REACT014 } from './version';
 import objectValues from 'object.values';
 

src/MountedTraversal.js

@@ -1,4 +1,4 @@
-import { isEmpty } from 'underscore';
+import isEmpty from 'lodash/isEmpty';
 import isSubset from 'is-subset';
 import {
   coercePropValue,

src/ReactWrapper.js

@@ -1,6 +1,8 @@
 import React from 'react';
 import cheerio from 'cheerio';
-import { flatten, unique, compact } from 'underscore';
+import flatten from 'lodash/flatten';
+import unique from 'lodash/uniq';
+import compact from 'lodash/compact';
 import createWrapperComponent from './ReactWrapperComponent';
 import {
   instHasClassName,

src/ShallowTraversal.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { isEmpty } from 'underscore';
+import isEmpty from 'lodash/isEmpty';
 import isSubset from 'is-subset';
 import {
   coercePropValue,

src/ShallowWrapper.js

@@ -1,5 +1,7 @@
 import React from 'react';
-import { flatten, unique, compact } from 'underscore';
+import flatten from 'lodash/flatten';
+import unique from 'lodash/uniq';
+import compact from 'lodash/compact';
 import cheerio from 'cheerio';
 import {
   nodeEqual,