Merge branch 'master' into master

CONTRIBUTING.md

@@ -22,7 +22,7 @@ npm install && npm run react:14
 ```
 
 
-### Switching between React 0.14 and React 0.13
+### Switching between React 15, React 0.14 and React 0.13
 
 ```bash
 # switch to React 0.13
@@ -34,6 +34,11 @@ npm run react:13
 npm run react:14
 ```
 
+```bash
+# switch to React 15
+npm run react:15
+```
+
 
 ### Running Tests
 
@@ -86,8 +91,8 @@ Before you submit a pull request from your forked repo, check that it meets thes
 1. If the pull request fixes a bug, it should include tests that fail without the changes, and pass
 with them.
 1. If the pull request adds functionality, the docs should be updated as part of the same PR.
-1. The pull request should work for both React 0.14 and React 0.13. The CI server should run the
-tests in both versions automatically when you push the PR, but if you'd like to check locally, you
+1. The pull request should work for React 15, React 0.14 and React 0.13. The CI server should run the
+tests in all versions automatically when you push the PR, but if you'd like to check locally, you
 can do so (see above).
 1. Please rebase and resolve all conflicts before submitting.
 

docs/api/mount.md

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

docs/guides/browserify.md

@@ -14,6 +14,7 @@ In your browserify configuration, you simply need to make sure that the followin
 labeled as "external", which means they will be ignored:
 
 ```
+react/addons
 react/lib/ReactContext
 react/lib/ExecutionEnvironment
 ```
@@ -26,6 +27,7 @@ var browserify = require('browserify');
 var b = browserify();
 
 // make sure to mark these as external!
+b.external('react/addons');
 b.external('react/lib/ReactContext');
 b.external('react/lib/ExecutionEnvironment');
 

docs/guides/karma.md

@@ -30,6 +30,7 @@ webpack: { //kind of a copy of your webpack config
   },
   externals: {
     'cheerio': 'window',
+    'react/addons': true,
     'react/lib/ExecutionEnvironment': true,
     'react/lib/ReactContext': true
   }
@@ -49,6 +50,7 @@ browserify: {
   ],
   configure: function(bundle) {
     bundle.on('prebundle', function() {
+      bundle.external('react/addons');
       bundle.external('react/lib/ReactContext');
       bundle.external('react/lib/ExecutionEnvironment');
     });

docs/guides/webpack.md

@@ -46,6 +46,20 @@ react-dom/server
 react-addons-test-utils
 ```
 
+## React 15 Compatability
+
+If you are using React 15, your config should include these externals:
+
+```js
+/* webpack.config.js */
+// ...
+externals: {
+  'react/addons': true,
+  'react/lib/ExecutionEnvironment': true,
+  'react/lib/ReactContext': true
+}
+// ...
+```
 
 ## Example Projects
 

test/ShallowWrapper-spec.js

@@ -308,9 +308,15 @@ describe('shallow', () => {
       const wrapper = shallow(
         <div>
           <input className="foo" />
+          <button className="bar">Button</button>
+          <textarea className="magic"></textarea>
+          <select className="reality"></select>
         </div>
       );
       expect(wrapper.find('input').props().className).to.equal('foo');
+      expect(wrapper.find('button').props().className).to.equal('bar');
+      expect(wrapper.find('textarea').props().className).to.equal('magic');
+      expect(wrapper.find('select').props().className).to.equal('reality');
     });
 
     it('should find a component based on a constructor', () => {