v4.1.0. fixes #370

redux-form · Jan 2, 2016 · 09f2186 · 09f2186
1 parent 2242bb4
commit 09f2186
Show file tree

Hide file tree

Showing 7 changed files with 239 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redux-form",
-  "version": "4.0.7",
+  "version": "4.1.0",
   "description": "A higher order component decorator for forms using Redux and React",
   "main": "./lib/index.js",
   "jsnext:main": "./src/index.js",

diff --git a/src/__tests__/createReduxForm.spec.js b/src/__tests__/createReduxForm.spec.js
@@ -1077,7 +1077,7 @@ describe('createReduxForm', () => {
     });
   });
 
-  it('should initialize an array field without blowing away existing value', () => {
+  it('should initialize an array field, blowing away existing value', () => {
     const store = makeStore();
     const form = 'testForm';
     const Decorated = reduxForm({
@@ -1110,9 +1110,9 @@ describe('createReduxForm', () => {
     expectField({
       field: stub.props.fields.children,
       name: 'children',
-      value: [1, 2],
+      value: [3, 4],
       valid: true,
-      dirty: true,
+      dirty: false,
       error: undefined,
       touched: false,
       visited: false
@@ -1121,7 +1121,7 @@ describe('createReduxForm', () => {
     expect(store.getState().form.testForm.children)
       .toEqual({
         initial: [3, 4],
-        value: [1, 2]
+        value: [3, 4]
       });
     // reset form to newly initialized values
     stub.props.resetForm();
@@ -1137,4 +1137,101 @@ describe('createReduxForm', () => {
       visited: false
     });
   });
+
+  it('should only initialize on mount once', () => {
+    const store = makeStore();
+    const form = 'testForm';
+    const Decorated = reduxForm({
+      form,
+      fields: ['name']
+    })(Form);
+    const dom = TestUtils.renderIntoDocument(
+      <Provider store={store}>
+        <Decorated initialValues={{name: 'Bob'}}/>
+      </Provider>
+    );
+    const stub = TestUtils.findRenderedComponentWithType(dom, Form);
+
+    // check value
+    expectField({
+      field: stub.props.fields.name,
+      name: 'name',
+      value: 'Bob',
+      valid: true,
+      dirty: false,
+      error: undefined,
+      touched: false,
+      visited: false
+    });
+    // check state
+    expect(store.getState().form.testForm.name)
+      .toEqual({
+        initial: 'Bob',
+        value: 'Bob'
+      });
+    // set value
+    stub.props.fields.name.onChange('Dan');
+    // check value
+    expectField({
+      field: stub.props.fields.name,
+      name: 'name',
+      value: 'Dan',
+      valid: true,
+      dirty: true,
+      error: undefined,
+      touched: false,
+      visited: false
+    });
+    // check state
+    expect(store.getState().form.testForm.name)
+      .toEqual({
+        initial: 'Bob',
+        value: 'Dan'
+      });
+
+    // should NOT dispatch INITIALIZE this time
+    const dom2 = TestUtils.renderIntoDocument(
+      <Provider store={store}>
+        <Decorated initialValues={{name: 'Bob'}}/>
+      </Provider>
+    );
+    const stub2 = TestUtils.findRenderedComponentWithType(dom2, Form);
+    // check that value is unchanged
+    expectField({
+      field: stub2.props.fields.name,
+      name: 'name',
+      value: 'Dan',
+      valid: true,
+      dirty: true,
+      error: undefined,
+      touched: false,
+      visited: false
+    });
+    // check state
+    expect(store.getState().form.testForm.name)
+      .toEqual({
+        initial: 'Bob',
+        value: 'Dan'
+      });
+
+    // manually initialize new values
+    stub.props.initializeForm({name: 'Tom'});
+    // check value
+    expectField({
+      field: stub2.props.fields.name,
+      name: 'name',
+      value: 'Tom',
+      valid: true,
+      dirty: false,
+      error: undefined,
+      touched: false,
+      visited: false
+    });
+    // check state
+    expect(store.getState().form.testForm.name)
+      .toEqual({
+        initial: 'Tom',
+        value: 'Tom'
+      });
+  });
 });
diff --git a/src/__tests__/initializeState.spec.js b/src/__tests__/initializeState.spec.js
@@ -161,11 +161,14 @@ describe('initializeState', () => {
     expect(isFieldValue(result.bar)).toBe(true);
   });
 
-  it('should initialize array values to state, not changing existing values', () => {
+  it('should initialize array values to state, changing existing values', () => {
     const result = initializeState({
       animals: ['cat', 'dog', 'rat'],
       bar: []
     }, ['animals', 'bar'], {
+      animals: {
+        value: ['hog', 'pig', 'doe']
+      },
       bar: {
         value: [{deeper: 42}]
       }
@@ -179,7 +182,7 @@ describe('initializeState', () => {
         },
         bar: {
           initial: [],
-          value: [{deeper: 42}]
+          value: []
         }
       });
     expect(isFieldValue(result.animals)).toBe(true);