Merging

Author: maludwig

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-redux-form",
-  "version": "1.14.0",
+  "version": "1.14.1",
   "description": "Create Forms Easily with React and Redux",
   "main": "lib/index.js",
   "typings": "react-redux-form.d.ts",
@@ -72,8 +72,8 @@
     "jsdom": "^9.2.1",
     "lodash": "~4.17.2",
     "mocha": "^2.5.1",
-    "react": "^16.0.0-beta.2",
-    "react-dom": "^16.0.0-beta.2",
+    "react": "^15.6.1",
+    "react-dom": "^15.6.1",
     "react-redux": "~5.0.0",
     "redux": "^3.3.1",
     "redux-immutable": "^3.0.8",

src/components/form-component.js

@@ -91,9 +91,6 @@ function createFormClass(s = defaultStrategy) {
     }
 
     componentDidMount() {
-      this.handleUpdate();
-      this.handleChange();
-
       if (containsEvent(this.props.validateOn, 'change')) {
         this.validate(this.props, true);
       }

test/local-forms-spec.js

@@ -11,16 +11,21 @@ describe('local forms', () => {
 
   describe('standard usage with onUpdate', () => {
     let innerFormState;
+    let dispatch;
 
     const form = TestUtils.renderIntoDocument(
-      <LocalForm onUpdate={(formValue) => innerFormState = formValue}>
+      <LocalForm
+        getDispatch={d => dispatch = d}
+        onUpdate={(formValue) => innerFormState = formValue}
+      >
         <Control.text model=".foo" />
       </LocalForm>
     );
 
     const input = TestUtils.findRenderedDOMComponentWithTag(form, 'input');
 
-    it('should initially update with the loaded form value', () => {
+    it('should update with the loaded form value', () => {
+      dispatch(actions.setPristine('local'));
       assert.containSubset(innerFormState, {
         $form: {
           pristine: true,
@@ -45,36 +50,33 @@ describe('local forms', () => {
   });
 
   describe('standard usage with onChange', () => {
-    let innerModelState;
+    let dispatch;
 
     const form = TestUtils.renderIntoDocument(
-      <LocalForm onChange={(modelValue) => innerModelState = modelValue}>
+      <LocalForm getDispatch={d => dispatch = d}>
         <Control.text model=".foo" />
       </LocalForm>
     );
 
     const input = TestUtils.findRenderedDOMComponentWithTag(form, 'input');
 
     it('should initially have an empty object (by default) as the model value', () => {
-      assert.deepEqual(innerModelState, {});
+      assert.equal(input.value, ''); // { foo: '' }
     });
 
     it('should behave like a normal form, with an internal Redux state', () => {
-      input.value = 'changed';
-      TestUtils.Simulate.change(input);
+      dispatch(actions.change('local', { foo: 'changed' }));
 
-      assert.deepEqual(innerModelState, {
-        foo: 'changed',
-      });
+      assert.equal(input.value, 'changed');
     });
   });
 
   describe('onChange with initialState', () => {
-    let innerModelState;
+    let dispatch;
 
     const form = TestUtils.renderIntoDocument(
       <LocalForm
-        onChange={(modelValue) => innerModelState = modelValue}
+        getDispatch={d => dispatch = d}
         initialState={{ foo: 'bar' }}
       >
         <Control.text model=".foo" />
@@ -84,16 +86,13 @@ describe('local forms', () => {
     const input = TestUtils.findRenderedDOMComponentWithTag(form, 'input');
 
     it('should initially have an empty object (by default) as the model value', () => {
-      assert.deepEqual(innerModelState, { foo: 'bar' });
+      assert.equal(input.value, 'bar');
     });
 
     it('should behave like a normal form, with an internal Redux state', () => {
-      input.value = 'changed';
-      TestUtils.Simulate.change(input);
+      dispatch(actions.change('local', { foo: 'changed' }));
 
-      assert.deepEqual(innerModelState, {
-        foo: 'changed',
-      });
+      assert.equal(input.value, 'changed');
     });
   });