From f8ed579c98a3c42235346b5e11e901a7b965567c Mon Sep 17 00:00:00 2001
From: Victor Cazanave <victor.cazanave@gmail.com>
Date: Fri, 13 Jul 2018 09:50:58 +0800
Subject: [PATCH 1/7] update setValue() to handle select elements

---
 packages/test-utils/src/wrapper.js  |  6 +++++-
 test/specs/wrapper/setValue.spec.js | 14 +++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/test-utils/src/wrapper.js b/packages/test-utils/src/wrapper.js
index 6b13b2005..b7bae94cb 100644
--- a/packages/test-utils/src/wrapper.js
+++ b/packages/test-utils/src/wrapper.js
@@ -697,8 +697,12 @@ export default class Wrapper implements BaseWrapper {
     const type = this.attributes().type
 
     if (tagName === 'SELECT') {
+      // $FlowIgnore
+      this.element.value = value
+      this.trigger('change')
+    } else if (tagName === 'OPTION') {
       throwError(
-        `wrapper.setValue() cannot be called on a <select> ` +
+        `wrapper.setValue() cannot be called on a <option> ` +
           `element. Use wrapper.setSelected() instead`
       )
     } else if (tagName === 'INPUT' && type === 'checkbox') {
diff --git a/test/specs/wrapper/setValue.spec.js b/test/specs/wrapper/setValue.spec.js
index e04e59c09..bb308fc92 100644
--- a/test/specs/wrapper/setValue.spec.js
+++ b/test/specs/wrapper/setValue.spec.js
@@ -2,6 +2,14 @@ import ComponentWithInput from '~resources/components/component-with-input.vue'
 import { describeWithShallowAndMount } from '~resources/utils'
 
 describeWithShallowAndMount('setValue', mountingMethod => {
+  it('sets element of select value', () => {
+    const wrapper = mountingMethod(ComponentWithInput)
+    const select = wrapper.find('select')
+    select.setValue('selectB')
+
+    expect(select.element.value).to.equal('selectB')
+  })
+  
   it('sets element of input value', () => {
     const wrapper = mountingMethod(ComponentWithInput)
     const input = wrapper.find('input[type="text"]')
@@ -27,10 +35,10 @@ describeWithShallowAndMount('setValue', mountingMethod => {
     expect(wrapper.text()).to.contain('input text awesome binding')
   })
 
-  it('throws error if element is select', () => {
+  it('throws error if element is option', () => {
     const message =
-      'wrapper.setValue() cannot be called on a <select> element. Use wrapper.setSelected() instead'
-    shouldThrowErrorOnElement('select', message)
+      'wrapper.setValue() cannot be called on a <option> element. Use wrapper.setSelected() instead'
+    shouldThrowErrorOnElement('option', message)
   })
 
   it('throws error if element is radio', () => {

From 4457c5f60232a81f08c8900834c892cc1f9f5b60 Mon Sep 17 00:00:00 2001
From: Victor Cazanave <victor.cazanave@gmail.com>
Date: Fri, 13 Jul 2018 10:29:55 +0800
Subject: [PATCH 2/7] update tests

---
 test/specs/wrapper/setValue.spec.js | 35 ++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/test/specs/wrapper/setValue.spec.js b/test/specs/wrapper/setValue.spec.js
index bb308fc92..3d02bdc75 100644
--- a/test/specs/wrapper/setValue.spec.js
+++ b/test/specs/wrapper/setValue.spec.js
@@ -2,14 +2,6 @@ import ComponentWithInput from '~resources/components/component-with-input.vue'
 import { describeWithShallowAndMount } from '~resources/utils'
 
 describeWithShallowAndMount('setValue', mountingMethod => {
-  it('sets element of select value', () => {
-    const wrapper = mountingMethod(ComponentWithInput)
-    const select = wrapper.find('select')
-    select.setValue('selectB')
-
-    expect(select.element.value).to.equal('selectB')
-  })
-  
   it('sets element of input value', () => {
     const wrapper = mountingMethod(ComponentWithInput)
     const input = wrapper.find('input[type="text"]')
@@ -26,15 +18,38 @@ describeWithShallowAndMount('setValue', mountingMethod => {
     expect(textarea.element.value).to.equal('foo')
   })
 
-  it('updates dom with v-model', () => {
+  it('updates dom with input v-model', () => {
     const wrapper = mountingMethod(ComponentWithInput)
     const input = wrapper.find('input[type="text"]')
-
     input.setValue('input text awesome binding')
 
     expect(wrapper.text()).to.contain('input text awesome binding')
   })
 
+  it('sets element of select value if option exists', () => {
+    const wrapper = mountingMethod(ComponentWithInput)
+    const select = wrapper.find('select')
+    select.setValue('selectB')
+
+    expect(select.element.value).to.equal('selectB')
+  })
+
+  it('keeps same value if option does not exist', () => {
+    const wrapper = mountingMethod(ComponentWithInput)
+    const select = wrapper.find('select')
+    select.setValue('selectZ')
+
+    expect(select.element.value).to.equal('selectA')
+  })
+
+  it('updates dom with select v-model', () => {
+    const wrapper = mountingMethod(ComponentWithInput)
+    const select = wrapper.find('select')
+    select.setValue('selectB')
+
+    expect(wrapper.text()).to.contain('selectB')
+  })
+
   it('throws error if element is option', () => {
     const message =
       'wrapper.setValue() cannot be called on a <option> element. Use wrapper.setSelected() instead'

From 9b6b9229961d2b27f7b0ef7976208d219d14c3c7 Mon Sep 17 00:00:00 2001
From: Victor Cazanave <victor.cazanave@gmail.com>
Date: Fri, 13 Jul 2018 10:32:10 +0800
Subject: [PATCH 3/7] update docs

---
 docs/api/wrapper/setValue.md | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/docs/api/wrapper/setValue.md b/docs/api/wrapper/setValue.md
index e55a91066..1784b30e3 100644
--- a/docs/api/wrapper/setValue.md
+++ b/docs/api/wrapper/setValue.md
@@ -1,11 +1,11 @@
 ## setValue(value)
 
-Sets value of a text-control input element and updates `v-model` bound data.
+Sets value of a text-control input or select element and updates `v-model` bound data.
 
 - **Arguments:**
   - `{any} value`
 
-- **Example:**
+- **Example with input:**
 
 ```js
 import { mount } from '@vue/test-utils'
@@ -24,3 +24,23 @@ input.setValue('some value')
 textInput.element.value = value
 textInput.trigger('input')
 ```
+
+- **Example with select:**
+
+```js
+import { mount } from '@vue/test-utils'
+import Foo from './Foo.vue'
+
+const wrapper = mount(Foo)
+const select = wrapper.find('select')
+select.setValue('optionA')
+```
+
+- **Note:**
+
+`select.setValue(value)` is an alias of the following code.
+
+```js
+select.element.value = value
+select.trigger('change')
+```

From d05da4030279e4069a113424656b8af0c46c0dd7 Mon Sep 17 00:00:00 2001
From: Victor Cazanave <victor.cazanave@gmail.com>
Date: Fri, 20 Jul 2018 14:22:21 +0800
Subject: [PATCH 4/7] fix typo in docs

---
 .github/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index a9628ce3a..0f88c6962 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -82,7 +82,7 @@ The default test script will do the following: lint with ESLint -> type check wi
 
   - **`create-instance`**: private package that creates an instance and applies mounting options.
 
-  - **`shared`**: private package that contains utilities used by the other packzges.
+  - **`shared`**: private package that contains utilities used by the other packages.
 
 - **`scripts`**: contains build-related scripts and configuration files. In most cases you don't need to touch them.
 

From ec73e53fe645ff511accd67004e131ca692fdcdf Mon Sep 17 00:00:00 2001
From: Victor Cazanave <victor.cazanave@gmail.com>
Date: Fri, 20 Jul 2018 14:39:37 +0800
Subject: [PATCH 5/7] update docs

---
 docs/api/wrapper/setValue.md | 39 ++++++++++++++----------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/docs/api/wrapper/setValue.md b/docs/api/wrapper/setValue.md
index 1784b30e3..c231e0ecd 100644
--- a/docs/api/wrapper/setValue.md
+++ b/docs/api/wrapper/setValue.md
@@ -5,42 +5,33 @@ Sets value of a text-control input or select element and updates `v-model` bound
 - **Arguments:**
   - `{any} value`
 
-- **Example with input:**
+- **Example:**
 
 ```js
 import { mount } from '@vue/test-utils'
 import Foo from './Foo.vue'
 
 const wrapper = mount(Foo)
+
 const input = wrapper.find('input[type="text"]')
 input.setValue('some value')
-```
-
-- **Note:**
-
-`textInput.setValue(value)` is an alias of the following code.
-
-```js
-textInput.element.value = value
-textInput.trigger('input')
-```
-
-- **Example with select:**
 
-```js
-import { mount } from '@vue/test-utils'
-import Foo from './Foo.vue'
-
-const wrapper = mount(Foo)
 const select = wrapper.find('select')
-select.setValue('optionA')
+select.setValue('option value')
 ```
 
 - **Note:**
 
-`select.setValue(value)` is an alias of the following code.
+  - `textInput.setValue(value)` is an alias of the following code.
 
-```js
-select.element.value = value
-select.trigger('change')
-```
+  ```js
+  textInput.element.value = value
+  textInput.trigger('input')
+  ```
+
+  - `select.setValue(value)` is an alias of the following code.
+
+  ```js
+  select.element.value = value
+  select.trigger('change')
+  ```

From 9e9985fcb0ecdd3dfe5e2a6d6891fd0b67923513 Mon Sep 17 00:00:00 2001
From: Victor Cazanave <victor.cazanave@gmail.com>
Date: Fri, 20 Jul 2018 15:09:57 +0800
Subject: [PATCH 6/7] remove test when option does not exists

---
 test/specs/wrapper/setValue.spec.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/test/specs/wrapper/setValue.spec.js b/test/specs/wrapper/setValue.spec.js
index 3d02bdc75..3c3b63512 100644
--- a/test/specs/wrapper/setValue.spec.js
+++ b/test/specs/wrapper/setValue.spec.js
@@ -26,7 +26,7 @@ describeWithShallowAndMount('setValue', mountingMethod => {
     expect(wrapper.text()).to.contain('input text awesome binding')
   })
 
-  it('sets element of select value if option exists', () => {
+  it('sets element of select value', () => {
     const wrapper = mountingMethod(ComponentWithInput)
     const select = wrapper.find('select')
     select.setValue('selectB')
@@ -34,14 +34,6 @@ describeWithShallowAndMount('setValue', mountingMethod => {
     expect(select.element.value).to.equal('selectB')
   })
 
-  it('keeps same value if option does not exist', () => {
-    const wrapper = mountingMethod(ComponentWithInput)
-    const select = wrapper.find('select')
-    select.setValue('selectZ')
-
-    expect(select.element.value).to.equal('selectA')
-  })
-
   it('updates dom with select v-model', () => {
     const wrapper = mountingMethod(ComponentWithInput)
     const select = wrapper.find('select')

From 3c45468322129409adf8f9d622d323be7da80c3f Mon Sep 17 00:00:00 2001
From: Victor Cazanave <victor.cazanave@gmail.com>
Date: Sat, 21 Jul 2018 22:19:49 +0800
Subject: [PATCH 7/7] fix typo

---
 packages/test-utils/src/wrapper.js  | 2 +-
 test/specs/wrapper/setValue.spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/test-utils/src/wrapper.js b/packages/test-utils/src/wrapper.js
index b7bae94cb..63936401f 100644
--- a/packages/test-utils/src/wrapper.js
+++ b/packages/test-utils/src/wrapper.js
@@ -702,7 +702,7 @@ export default class Wrapper implements BaseWrapper {
       this.trigger('change')
     } else if (tagName === 'OPTION') {
       throwError(
-        `wrapper.setValue() cannot be called on a <option> ` +
+        `wrapper.setValue() cannot be called on an <option> ` +
           `element. Use wrapper.setSelected() instead`
       )
     } else if (tagName === 'INPUT' && type === 'checkbox') {
diff --git a/test/specs/wrapper/setValue.spec.js b/test/specs/wrapper/setValue.spec.js
index 3c3b63512..e5e9d3837 100644
--- a/test/specs/wrapper/setValue.spec.js
+++ b/test/specs/wrapper/setValue.spec.js
@@ -44,7 +44,7 @@ describeWithShallowAndMount('setValue', mountingMethod => {
 
   it('throws error if element is option', () => {
     const message =
-      'wrapper.setValue() cannot be called on a <option> element. Use wrapper.setSelected() instead'
+      'wrapper.setValue() cannot be called on an <option> element. Use wrapper.setSelected() instead'
     shouldThrowErrorOnElement('option', message)
   })