From 7d699f40638927375174746bd5e24abff0043512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Fri, 4 Dec 2015 09:26:57 +0100
Subject: [PATCH] Fix single select incorrectly updating

Closes #5592
---
 .../dom/client/wrappers/ReactDOMSelect.js         |  2 +-
 .../wrappers/__tests__/ReactDOMSelect-test.js     | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/renderers/dom/client/wrappers/ReactDOMSelect.js b/src/renderers/dom/client/wrappers/ReactDOMSelect.js
index bf36fc19c245..6e75a9e3e21b 100644
--- a/src/renderers/dom/client/wrappers/ReactDOMSelect.js
+++ b/src/renderers/dom/client/wrappers/ReactDOMSelect.js
@@ -29,7 +29,7 @@ function updateOptionsIfPendingUpdateAndMounted() {
     var value = LinkedValueUtils.getValue(props);
 
     if (value != null) {
-      updateOptions(this, props, value);
+      updateOptions(this, Boolean(props.multiple), value);
     }
   }
 }
diff --git a/src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js b/src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js
index 56ee48e11a1c..f3f3090c2972 100644
--- a/src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js
+++ b/src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js
@@ -475,4 +475,19 @@ describe('ReactDOMSelect', function() {
     ReactTestUtils.renderIntoDocument(<select value={null}><option value="test"/></select>);
     expect(console.error.argsForCall.length).toBe(1);
   });
+
+  it('should refresh state on change', function() {
+    var stub =
+      <select value="giraffe" onChange={noop}>
+        <option value="monkey">A monkey!</option>
+        <option value="giraffe">A giraffe!</option>
+        <option value="gorilla">A gorilla!</option>
+      </select>;
+    stub = ReactTestUtils.renderIntoDocument(stub);
+    var node = ReactDOM.findDOMNode(stub);
+
+    ReactTestUtils.Simulate.change(node);
+
+    expect(node.value).toBe('giraffe');
+  });
 });