Merge branch 'master' into patch-2

enzymejs · Jan 26, 2018 · 4a915fa · 4a915fa
2 parents a9f1e87 + 9704c3f
commit 4a915fa
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/INTHEWILD.md b/INTHEWILD.md
@@ -3,6 +3,7 @@ Please use [pull requests](https://github.com/airbnb/enzyme/pull/new/master) to
 Organizations
 ----------
  - [Airbnb](https://github.com/airbnb)
+ - [Cerner](https://github.com/cerner)
  - [OpenGov](https://github.com/opengov)
  - [Pinterest](https://github.com/pinterest)
  - [Product Hunt](https://github.com/producthunt)

diff --git a/docs/api/ShallowWrapper/setProps.md b/docs/api/ShallowWrapper/setProps.md
@@ -57,14 +57,6 @@ expect(spy.calledOnce).to.equal(true);
 ```
 
 
-#### Common Gotchas
-
-`setProps()` will not trigger the lifecycle method `componentDidUpdate` when using `shallow()` unless you set `lifecycleExperimental` to true.
-
-```jsx
-const wrapper = shallow(<MyComponent />, { lifecycleExperimental: true });
-```
-
 #### Related Methods
 
 - [`.setState(state) => Self`](setState.md)