Merge branch 'master' into master

docs/api/ShallowWrapper/contains.md

@@ -56,6 +56,17 @@ expect(wrapper.contains([
 ])).to.equal(false);
 ```
 
+```jsx
+const calculatedValue = 2 + 2;
+
+const wrapper = shallow((
+  <div>
+    <div data-foo="foo" data-bar="bar">{calculatedValue}</div>
+  </div>
+));
+
+expect(wrapper.contains(<div data-foo="foo" data-bar="bar">{4}</div>)).to.equal(true);
+```
 
 #### Common Gotchas
 

docs/api/mount.md

@@ -1,8 +1,6 @@
 # Full Rendering API (`mount(...)`)
 
-Full DOM rendering is ideal for use cases where you have components that may interact with DOM APIs,
-or may require the full lifecycle in order to fully test the component (i.e., `componentDidMount`
-etc.)
+Full DOM rendering is ideal for use cases where you have components that may interact with DOM APIs or need to test components that are wrapped in higher order components.
 
 Full DOM rendering requires that a full DOM API be available at the global scope. This means that
 it must be run in an environment that at least “looks like” a browser environment. If you do not

docs/api/shallow.md

@@ -3,6 +3,8 @@
 Shallow rendering is useful to constrain yourself to testing a component as a unit, and to ensure
 that your tests aren't indirectly asserting on behavior of child components.
 
+As of Enzyme v3, the `shallow` API does call React lifecycle methods such as `componentDidMount` and `componentDidUpdate`. You can read more about this in the [version 3 migration guide](../guides/migration-from-2-to-3.md#lifecycle-methods).
+
 ```jsx
 import { shallow } from 'enzyme';
 import sinon from 'sinon';