Merge branch 'theresakhoo-master'

Author: chollier

src/DateTimeField.js

@@ -68,7 +68,7 @@ export default class DateTimeField extends Component {
         state.inputValue = moment(nextProps.dateTime, nextProps.format, true).format(nextProps.inputFormat);
     }
 
-    if (moment(nextProps.dateTime, nextProps.format, true).isValid()) {
+    if (nextProps.dateTime !== this.props.dateTime && moment(nextProps.dateTime, nextProps.format, true).isValid()) {
       state.viewDate = moment(nextProps.dateTime, nextProps.format, true).startOf("month");
       state.selectedDate = moment(nextProps.dateTime, nextProps.format, true);
       state.inputValue = moment(nextProps.dateTime, nextProps.format, true).format(nextProps.inputFormat ? nextProps.inputFormat : this.state.inputFormat);

src/__tests__/DateTimeField-test.js

@@ -7,45 +7,62 @@ describe("DateTimeField", function() {
   const moment = require("moment");
   const DateTimeField = require("../DateTimeField.js");
   const happyDate = moment("1990-06-05 07:30");
-  let parent, TestParent;
-
-  beforeEach(() => {
-    TestParent = React.createFactory(React.createClass({
-      getInitialState() {
-        return { dateTime: happyDate.format("x") };
-      },
-
-      render() {
-        return <DateTimeField {...this.state} />;
-      }
-    }));
-    parent = TestUtils.renderIntoDocument(TestParent()); // eslint-disable-line
-  });
+  let createParent, TestParent;
+
 
   describe("By default", function() {
 
    it("shows the right date for a given dateTime and inputFormat", function() {
-     const input = TestUtils.findRenderedDOMComponentWithTag(parent, "input");
+     const component = TestUtils.renderIntoDocument(<DateTimeField dateTime={happyDate.format("x")} />);
+     const input = TestUtils.findRenderedDOMComponentWithTag(component, "input");
      expect(input.getDOMNode().value).toBe("06/05/90 7:30 AM");
     });
 
   });
 
   describe("When changing props", function() {
 
-   it("changes the displayed date when dateTime changes", function() {
-     const input = TestUtils.findRenderedDOMComponentWithTag(parent, "input");
-     expect(input.getDOMNode().value).toBe("06/05/90 7:30 AM");
-     parent.setState({dateTime: moment("1981-06-04 05:45").format("x")});
-     expect(input.getDOMNode().value).toBe("06/04/81 5:45 AM");
+    beforeEach(() => {
+      TestParent = React.createFactory(React.createClass({
+        getInitialState() {
+          return {
+            dateTime: happyDate.format("x"),
+            ...this.props
+          };
+        },
+
+        render() {
+          return <DateTimeField {...this.state} />;
+        }
+      }));
+      createParent = (initalState) => TestUtils.renderIntoDocument(TestParent(initalState)); // eslint-disable-line
     });
 
-   it("changes the displayed format when inputFormat changes", function() {
-     const input = TestUtils.findRenderedDOMComponentWithTag(parent, "input");
-     expect(input.getDOMNode().value).toBe("06/05/90 7:30 AM");
-     parent.setState({inputFormat: "x"});
-     expect(input.getDOMNode().value).toBe(happyDate.format("x"));
+    it("changes the displayed date when dateTime changes", function() {
+      const Parent = createParent();
+      const input = TestUtils.findRenderedDOMComponentWithTag(Parent, "input");
+      expect(input.getDOMNode().value).toBe("06/05/90 7:30 AM");
+      Parent.setState({dateTime: moment("1981-06-04 05:45").format("x")});
+      expect(input.getDOMNode().value).toBe("06/04/81 5:45 AM");
+     });
+
+    it("changes the displayed format when inputFormat changes", function() {
+      const Parent = createParent();
+      const input = TestUtils.findRenderedDOMComponentWithTag(Parent, "input");
+      expect(input.getDOMNode().value).toBe("06/05/90 7:30 AM");
+      Parent.setState({inputFormat: "x"});
+      expect(input.getDOMNode().value).toBe(happyDate.format("x"));
+     });
+
+    it("doesn't change the defaultText if dateTime didn't change", function() {
+      const Parent = createParent({defaultText: "Pick a date"});
+      const input = TestUtils.findRenderedDOMComponentWithTag(Parent, "input");
+      expect(input.getDOMNode().value).toBe("Pick a date");
+      Parent.setState({});
+      expect(input.getDOMNode().value).toBe("Pick a date");
     });
 
+
   });
+
 });