From c71cb3f2fd5d9aff1e16edbdbc542b3b03933b05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=95=8F?= <cookfront@gmail.com>
Date: Fri, 21 Apr 2017 21:25:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4=EF=BC=8C=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=20(#3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* unit test

* picker and dialog unit tes

* fix:quantity and loading
---
 docs/examples-dist/quantity.vue     |   2 +-
 docs/examples-docs/quantity.md      |   2 +-
 docs/src/ExamplesApp.vue            |   5 +
 docs/src/components/demo-list.vue   |   1 +
 packages/checkbox/src/checkbox.vue  |   9 +-
 packages/picker/src/picker.vue      |   2 +-
 packages/quantity/src/quantity.vue  |   2 +-
 packages/vant-css/src/loading.css   |   4 +-
 packages/vant-css/src/quantity.css  |   8 ++
 test/unit/specs/actionsheet.spec.js |   6 ++
 test/unit/specs/button.spec.js      |  19 +++-
 test/unit/specs/checkbox.spec.js    |  35 +++++--
 test/unit/specs/dialog.spec.js      |  27 +++++
 test/unit/specs/pciker.spec.js      | 149 +++++++++++++++++++++++++++-
 test/unit/specs/popup.spec.js       |  11 ++
 test/unit/specs/quantity.spec.js    |   4 +
 16 files changed, 268 insertions(+), 18 deletions(-)
 create mode 100644 test/unit/specs/dialog.spec.js

diff --git a/docs/examples-dist/quantity.vue b/docs/examples-dist/quantity.vue
index 29a320821..e2d0ddb94 100644
--- a/docs/examples-dist/quantity.vue
+++ b/docs/examples-dist/quantity.vue
@@ -7,7 +7,7 @@
 
               </example-block><example-block title="高级用法">
                 <van-quantity v-model="quantity2" min="5" max="40" step="2" default-value="9"></van-quantity>
-<p class="curr-quantity">当前值：{{ quantity2 }}</p>
+<p class="curr-quantity">当前值：{{ quantity2 || 9 }}</p>
 
               </example-block></section></template>
 <style>
diff --git a/docs/examples-docs/quantity.md b/docs/examples-docs/quantity.md
index 09f8686da..7f43f239e 100644
--- a/docs/examples-docs/quantity.md
+++ b/docs/examples-docs/quantity.md
@@ -83,7 +83,7 @@ export default {
 :::demo 高级用法
 ```html
 <van-quantity v-model="quantity2" min="5" max="40" step="2" default-value="9"></van-quantity>
-<p class="curr-quantity">当前值：{{ quantity2 }}</p>
+<p class="curr-quantity">当前值：{{ quantity2 || 9 }}</p>
 ```
 :::
 
diff --git a/docs/src/ExamplesApp.vue b/docs/src/ExamplesApp.vue
index 17611ae67..6b352ae0d 100644
--- a/docs/src/ExamplesApp.vue
+++ b/docs/src/ExamplesApp.vue
@@ -83,6 +83,10 @@ export default {
     height: 100%;
   }
 
+  body {
+    font-family: 'Helvetica Neue',Helvetica,'PingFang SC','Hiragino Sans GB','Microsoft YaHei',SimSun,sans-serif;
+  }
+
   .examples-container {
     height: 100%;
     overflow: auto;
@@ -117,6 +121,7 @@ export default {
 
   .demo-sub-title {
     font-size: 14px;
+    font-weight: normal;
     color: #999;
     padding: 30px 15px 10px;
   }
diff --git a/docs/src/components/demo-list.vue b/docs/src/components/demo-list.vue
index f0091b207..f7b2950e5 100644
--- a/docs/src/components/demo-list.vue
+++ b/docs/src/components/demo-list.vue
@@ -44,6 +44,7 @@ export default {
     .zanui-desc {
       text-align: center;
       font-weight: normal;
+      user-select: none;
     }
 
     .zanui-title {
diff --git a/packages/checkbox/src/checkbox.vue b/packages/checkbox/src/checkbox.vue
index bf11bbf5d..816d5f6d1 100644
--- a/packages/checkbox/src/checkbox.vue
+++ b/packages/checkbox/src/checkbox.vue
@@ -56,12 +56,14 @@ export default {
         if (this.isGroup && this.parentGroup) {
           const parentValue = this.parentGroup.value.slice();
           if (val) {
+            /* istanbul ignore else */
             if (parentValue.indexOf(this.name) === -1) {
               parentValue.push(this.name);
               this.parentGroup.$emit('input', parentValue);
             }
           } else {
             const index = parentValue.indexOf(this.name);
+            /* istanbul ignore else */
             if (index !== -1) {
               parentValue.splice(index, 1);
               this.parentGroup.$emit('input', parentValue);
@@ -77,8 +79,11 @@ export default {
      * `checkbox`是否被选中
      */
     isChecked() {
-      if ({}.toString.call(this.currentValue) === '[object Boolean]') {
-        return this.currentValue;
+      const currentValue = this.currentValue;
+      if ({}.toString.call(currentValue) === '[object Boolean]') {
+        return currentValue;
+      } else if (currentValue !== null && currentValue !== undefined) {
+        return currentValue === this.name;
       }
     },
 
diff --git a/packages/picker/src/picker.vue b/packages/picker/src/picker.vue
index 36e6198b7..5e7f7cf86 100644
--- a/packages/picker/src/picker.vue
+++ b/packages/picker/src/picker.vue
@@ -13,7 +13,7 @@
         :values="item.values"
         :class-name="item.className"
         :itemHeight="itemHeight"
-        :visible-item-count="visibleItemCount"
+        :visible-item-count="visibileColumnCount"
         :value-key="valueKey"
         @columnChange="columnValueChange(index)">
       </picker-column>
diff --git a/packages/quantity/src/quantity.vue b/packages/quantity/src/quantity.vue
index b1ae1c4a6..3923f2b8b 100644
--- a/packages/quantity/src/quantity.vue
+++ b/packages/quantity/src/quantity.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="van-quantity">
+  <div class="van-quantity" :class="{ 'van-quantity--disabled': disabled }">
     <button
       @click="handleChange('minus')"
       class="van-quantity__stepper van-quantity__minus"
diff --git a/packages/vant-css/src/loading.css b/packages/vant-css/src/loading.css
index 446e0bbe5..6db1123ff 100644
--- a/packages/vant-css/src/loading.css
+++ b/packages/vant-css/src/loading.css
@@ -55,11 +55,11 @@
 
       @m gradient-circle {
         &.van-loading__spinner--black {
-          background: url('data:image/png;base64,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');
+          background: url('data:image/png;base64,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');
           background-size: contain;
         }
         &.van-loading__spinner--white {
-          background: url('data:image/png;base64,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');
+          background: url('data:image/png;base64,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');
           background-size: contain;
         }
       }
diff --git a/packages/vant-css/src/quantity.css b/packages/vant-css/src/quantity.css
index d37204c97..b44dd8c33 100644
--- a/packages/vant-css/src/quantity.css
+++ b/packages/vant-css/src/quantity.css
@@ -4,6 +4,14 @@
   @b quantity {
     font-size: 0;
 
+    @m disabled {
+      .van-quantity__input,
+      .van-quantity__minus,
+      .van-quantity__plus {
+        border-color: #e8e8e8;
+      }
+    }
+
     @e stepper {
       width: 40px;
       height: 30px;
diff --git a/test/unit/specs/actionsheet.spec.js b/test/unit/specs/actionsheet.spec.js
index 182a9ee86..bebd408f1 100644
--- a/test/unit/specs/actionsheet.spec.js
+++ b/test/unit/specs/actionsheet.spec.js
@@ -75,6 +75,9 @@ describe('ActionSheet', () => {
             callback: () => {
               called = true;
             }
+          },
+          {
+            name: '微信'
           }
         ]
       }
@@ -83,6 +86,9 @@ describe('ActionSheet', () => {
     const actionItem = wrapper.find('.van-actionsheet__item')[0];
     actionItem.simulate('click');
     expect(called).to.be.true;
+
+    const secondActionItem = wrapper.find('.van-actionsheet__item')[1];
+    secondActionItem.simulate('click');
   });
 
   it('create actionsheet with cancel button', () => {
diff --git a/test/unit/specs/button.spec.js b/test/unit/specs/button.spec.js
index ddea0e72a..882e45e73 100644
--- a/test/unit/specs/button.spec.js
+++ b/test/unit/specs/button.spec.js
@@ -1,5 +1,5 @@
 import Button from 'packages/button';
-import ZanLoading from 'packages/loading';
+import VanLoading from 'packages/loading';
 import { mount } from 'avoriaz';
 
 describe('Button', () => {
@@ -122,7 +122,7 @@ describe('Button', () => {
         loading: true
       }
     });
-    const loading = wrapper.find(ZanLoading)[0];
+    const loading = wrapper.find(VanLoading)[0];
 
     expect(wrapper.hasClass('van-button')).to.be.true;
     expect(loading.isVueComponent).to.be.true;
@@ -132,4 +132,19 @@ describe('Button', () => {
 
     expect(eventStub.called).to.be.false;
   });
+
+  it('create a primary loading button', () => {
+    wrapper = mount(Button, {
+      propsData: {
+        type: 'primary',
+        loading: true
+      }
+    });
+
+    expect(wrapper.hasClass('van-button')).to.be.true;
+    expect(wrapper.hasClass('van-button--primary')).to.be.true;
+
+    const loading = wrapper.find(VanLoading)[0];
+    expect(loading.isVueComponent).to.be.true;
+  });
 });
diff --git a/test/unit/specs/checkbox.spec.js b/test/unit/specs/checkbox.spec.js
index 70d2ef69d..1fa242c13 100644
--- a/test/unit/specs/checkbox.spec.js
+++ b/test/unit/specs/checkbox.spec.js
@@ -77,15 +77,36 @@ describe('Checkbox', () => {
   it('create a checkbox', () => {
     wrapper = mount(Checkbox, {
       propsData: {
-        value: false,
+        value: true,
         disabled: false
       }
     });
 
     expect(wrapper.hasClass('van-checkbox')).to.be.true;
-    expect(wrapper.instance().currentValue).to.be.false;
-    expect(wrapper.instance().isDisabled).to.be.false;
-    expect(wrapper.instance().isChecked).to.be.false;
+    expect(wrapper.vm.currentValue).to.be.true;
+    expect(wrapper.vm.isDisabled).to.be.false;
+    expect(wrapper.vm.isChecked).to.be.true;
+  });
+
+  it('create a not boolean value checkbox', (done) => {
+    wrapper = mount(Checkbox, {
+      propsData: {
+        value: 'test',
+        name: 'test'
+      }
+    });
+
+    expect(wrapper.hasClass('van-checkbox')).to.be.true;
+    expect(wrapper.vm.currentValue).to.equal('test');
+    expect(wrapper.vm.isDisabled).to.be.false;
+    expect(wrapper.vm.isChecked).to.be.true;
+
+    wrapper.vm.value = null;
+    wrapper.update();
+    wrapper.vm.$nextTick(() => {
+      expect(wrapper.vm.currentValue).to.equal(null);
+      done();
+    });
   });
 
   it('click on a checkbox', (done) => {
@@ -120,12 +141,12 @@ describe('Checkbox', () => {
 
     expect(wrapper.hasClass('van-checkbox')).to.be.true;
     expect(wrapper.hasClass('van-checkbox--disabled')).to.be.true;
-    expect(wrapper.instance().currentValue).to.be.false;
-    expect(wrapper.instance().isDisabled).to.be.true;
+    expect(wrapper.vm.currentValue).to.be.false;
+    expect(wrapper.vm.isDisabled).to.be.true;
 
     const checkboxLabel = wrapper.find('.van-checkbox__label')[0];
     checkboxLabel.simulate('click');
 
-    expect(wrapper.instance().currentValue).to.be.false;
+    expect(wrapper.vm.currentValue).to.be.false;
   });
 });
diff --git a/test/unit/specs/dialog.spec.js b/test/unit/specs/dialog.spec.js
new file mode 100644
index 000000000..40a09f63d
--- /dev/null
+++ b/test/unit/specs/dialog.spec.js
@@ -0,0 +1,27 @@
+// import Dialog from 'packages/dialog';
+import DialogComponent from 'packages/dialog/src/dialog.vue';
+import { mount } from 'avoriaz';
+
+describe('Dialog', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('create a dialog component', () => {
+    let called = false;
+    wrapper = mount(DialogComponent);
+    wrapper.vm.callback = () => {
+      called = true;
+    };
+
+    expect(wrapper.hasClass('van-dialog-wrapper')).to.be.true;
+    expect(wrapper.data().confirmButtonText).to.equal('确认');
+
+    const confirmBtn = wrapper.find('.van-dialog__confirm')[0];
+    confirmBtn.simulate('click');
+
+    expect(wrapper.vm.value).to.be.false;
+    expect(called).to.be.true;
+  });
+});
diff --git a/test/unit/specs/pciker.spec.js b/test/unit/specs/pciker.spec.js
index 64f6a2643..95e959525 100644
--- a/test/unit/specs/pciker.spec.js
+++ b/test/unit/specs/pciker.spec.js
@@ -1,12 +1,113 @@
 import Picker from 'packages/picker';
+import PickerColumn from 'packages/picker/src/picker-column';
 import { mount } from 'avoriaz';
 
+const pickerColumns = [
+  {
+    values: ['vip', 'normal'],
+    className: 'column1'
+  },
+  {
+    values: ['1990', '1991', '1992', '1993', '1994', '1995'],
+    className: 'column2'
+  }
+];
+
 describe('Picker', () => {
   let wrapper;
   afterEach(() => {
     wrapper && wrapper.destroy();
   });
 
+  it('create picker', () => {
+    wrapper = mount(Picker, {
+      propsData: {
+        columns: pickerColumns
+      }
+    });
+
+    expect(wrapper.hasClass('van-picker')).to.be.true;
+    expect(wrapper.contains('.van-picker__columns--2')).to.be.true;
+
+    expect(wrapper.vm.getColumnValues(0).length).to.equal(2);
+    expect(wrapper.vm.getValues().length).to.equal(2);
+  });
+
+  it('set picker values', () => {
+    wrapper = mount(Picker, {
+      propsData: {
+        columns: pickerColumns
+      }
+    });
+
+    expect(wrapper.contains('.van-picker__columns--2')).to.be.true;
+    expect(wrapper.vm.getColumnValues(0).length).to.equal(2);
+    expect(wrapper.vm.getColumnValues(1).length).to.equal(6);
+
+    expect(wrapper.vm.getColumnValue(0)).to.equal('vip');
+    expect(wrapper.vm.getColumnValue(1)).to.equal('1990');
+
+    wrapper.vm.setColumnValue(0, 'normal');
+    expect(wrapper.vm.getColumnValue(0)).to.equal('normal');
+
+    wrapper.vm.setColumnValue(1, '1991');
+    expect(wrapper.vm.getColumnValue(1)).to.equal('1991');
+
+    wrapper.vm.setColumnValues(0, ['vip', 'normal', 'other']);
+    expect(wrapper.vm.getColumnValues(0).length).to.equal(3);
+
+    expect(wrapper.vm.getValues().length).to.equal(2);
+    wrapper.vm.setValues(['vip', '1992']);
+    expect(wrapper.vm.getColumnValue(0)).to.equal('vip');
+    expect(wrapper.vm.getColumnValue(1)).to.equal('1992');
+  });
+
+  it('create a invalid columns picker', () => {
+    wrapper = mount(Picker, {
+      propsData: {
+        columns: undefined
+      }
+    });
+
+    expect(wrapper.hasClass('van-picker')).to.be.true;
+    expect(wrapper.vm.values.length).to.equal(0);
+  });
+
+  it('set invalid index columns', () => {
+    wrapper = mount(Picker, {
+      propsData: {
+        columns: pickerColumns
+      }
+    });
+
+    expect(wrapper.vm.getColumnValues(3)).to.equal(undefined);
+    wrapper.vm.setColumnValues(3, [1, 2]);
+    expect(wrapper.vm.getColumnValues(3)).to.equal(undefined);
+
+    expect(wrapper.vm.getColumnValue(3)).to.equal(undefined);
+    wrapper.vm.setColumnValue(3, 3);
+    expect(wrapper.vm.getColumnValue(3)).to.equal(undefined);
+  });
+
+  it('emit a change event when column change', (done) => {
+    wrapper = mount(Picker, {
+      propsData: {
+        columns: pickerColumns
+      }
+    });
+
+    const eventStub = sinon.stub(wrapper.vm, '$emit');
+    const firstColumn = wrapper.find(PickerColumn)[0];
+    firstColumn.vm.currentValue = 'normal';
+
+    firstColumn.update();
+    wrapper.vm.$nextTick(() => {
+      expect(eventStub.calledOnce).to.be.true;
+      expect(eventStub.calledWith('change'));
+      done();
+    });
+  });
+
   it('create a empty picker and emit a cencel event', (done) => {
     wrapper = mount(Picker, {
       propsData: {
@@ -16,7 +117,7 @@ describe('Picker', () => {
 
     expect(wrapper.hasClass('van-picker')).to.be.true;
     expect(wrapper.contains('.van-picker__toolbar')).to.be.true;
-    expect(wrapper.computed().values().length).to.equal(0);
+    expect(wrapper.vm.values.length).to.equal(0);
 
     const eventStub = sinon.stub(wrapper.vm, '$emit');
     const cancelBtn = wrapper.find('.van-picker__cancel')[0];
@@ -50,3 +151,49 @@ describe('Picker', () => {
     });
   });
 });
+
+describe('PickerColumn', () => {
+  let wrapper;
+  afterEach(() => {
+    wrapper && wrapper.destroy();
+  });
+
+  it('create a picker-column', () => {
+    wrapper = mount(PickerColumn);
+
+    expect(wrapper.hasClass('van-picker-column')).to.be.true;
+    expect(wrapper.vm.values.length).to.equal(0);
+  });
+
+  it('change picker-column values', (done) => {
+    wrapper = mount(PickerColumn);
+
+    expect(wrapper.hasClass('van-picker-column')).to.be.true;
+    expect(wrapper.vm.values.length).to.equal(0);
+
+    wrapper.vm.values = [1, 2];
+    wrapper.update();
+    wrapper.vm.$nextTick(() => {
+      expect(wrapper.vm.values.length).to.equal(2);
+      expect(wrapper.vm.currentValues.length).to.equal(2);
+      done();
+    });
+  });
+
+  it('create a picker with values', (done) => {
+    wrapper = mount(PickerColumn, {
+      propsData: {
+        values: [1, 2]
+      }
+    });
+
+    expect(wrapper.vm.values.length).to.equal(2);
+    wrapper.vm.currentValues = [2, 3];
+    wrapper.update();
+    wrapper.vm.$nextTick(() => {
+      expect(wrapper.vm.values.length).to.equal(2);
+      expect(wrapper.vm.currentValue).to.equal(2);
+      done();
+    });
+  });
+});
diff --git a/test/unit/specs/popup.spec.js b/test/unit/specs/popup.spec.js
index 07b23b0e1..202cfbdb5 100644
--- a/test/unit/specs/popup.spec.js
+++ b/test/unit/specs/popup.spec.js
@@ -46,4 +46,15 @@ describe('Popup', () => {
 
     expect(wrapper.data().currentValue).to.be.true;
   });
+
+  it('create a popup-fade transition popup', () => {
+    wrapper = mount(Popup, {
+      propsData: {
+        transition: 'popup-fade'
+      }
+    });
+
+    expect(wrapper.hasClass('van-popup')).to.be.true;
+    expect(wrapper.instance().currentTransition).to.equal('popup-fade');
+  });
 });
diff --git a/test/unit/specs/quantity.spec.js b/test/unit/specs/quantity.spec.js
index a573dedc8..e7be5f293 100644
--- a/test/unit/specs/quantity.spec.js
+++ b/test/unit/specs/quantity.spec.js
@@ -88,9 +88,13 @@ describe('Quantity', () => {
     });
 
     expect(wrapper.hasClass('van-quantity')).to.be.true;
+    expect(wrapper.vm.currentValue).to.equal(30);
     const eventStub = sinon.stub(wrapper.vm, '$emit');
+
+    wrapper.vm.value = 30;
     wrapper.update();
     wrapper.vm.$nextTick(() => {
+      expect(wrapper.vm.currentValue).to.equal(30);
       expect(eventStub.calledWith('input'));
       done();
     });