支持SSR、升级Vue版本和增加新的icon (#40)

* search component add new style

* update vue version and support ssr

* unit test

* add new icon

* new icon

test/unit/specs/actionsheet.spec.js

@@ -84,11 +84,11 @@ describe('ActionSheet', () => {
     });
 
     const actionItem = wrapper.find('.van-actionsheet__item')[0];
-    actionItem.simulate('click');
+    actionItem.trigger('click');
     expect(called).to.be.true;
 
     const secondActionItem = wrapper.find('.van-actionsheet__item')[1];
-    secondActionItem.simulate('click');
+    secondActionItem.trigger('click');
   });
 
   it('create actionsheet with cancel button', () => {

test/unit/specs/badge.spec.js

@@ -21,7 +21,7 @@ describe('BadgeGroup', () => {
 
     const badge = wrapper.find('.van-badge')[0];
     const eventStub = sinon.stub(badge.vNode.child, '$emit');
-    badge.simulate('click');
+    badge.trigger('click');
 
     expect(eventStub.calledWith('click')).to.be.true;
   });

test/unit/specs/button.spec.js

@@ -17,7 +17,7 @@ describe('Button', () => {
     expect(wrapper.hasClass('van-button--normal')).to.be.true;
 
     const eventStub = sinon.stub(wrapper.vm, '$emit');
-    wrapper.simulate('click');
+    wrapper.trigger('click');
 
     expect(eventStub.calledOnce).to.be.true;
     expect(eventStub.calledWith('click')).to.be.true;
@@ -111,7 +111,7 @@ describe('Button', () => {
     expect(wrapper.hasClass('van-button--disabled')).to.be.true;
 
     const eventStub = sinon.stub(wrapper.vm, '$emit');
-    wrapper.simulate('click');
+    wrapper.trigger('click');
 
     expect(eventStub.called).to.be.false;
   });
@@ -128,7 +128,7 @@ describe('Button', () => {
     expect(loading.isVueComponent).to.be.true;
 
     const eventStub = sinon.stub(wrapper.vm, '$emit');
-    wrapper.simulate('click');
+    wrapper.trigger('click');
 
     expect(eventStub.called).to.be.false;
   });

test/unit/specs/cell.spec.js

@@ -44,7 +44,7 @@ describe('Cell', () => {
     wrapper = mount(Cell);
 
     const eventStub = sinon.stub(wrapper.vm, '$emit');
-    wrapper.simulate('click');
+    wrapper.trigger('click');
 
     expect(eventStub.calledOnce).to.be.true;
     expect(eventStub.calledWith('click')).to.be.true;

test/unit/specs/checkbox.spec.js

@@ -41,7 +41,7 @@ describe('CheckboxGroup', () => {
     const eventStub = sinon.stub(wrapper.vNode.child, '$emit');
 
     const firstCheckboxLabel = wrapper.find('.van-checkbox')[0].find('.van-checkbox__label')[0];
-    firstCheckboxLabel.simulate('click');
+    firstCheckboxLabel.trigger('click');
 
     wrapper.update();
     wrapper.vm.$nextTick(() => {
@@ -57,7 +57,7 @@ describe('CheckboxGroup', () => {
     const eventStub = sinon.stub(wrapper.vNode.child, '$emit');
 
     const lastCheckboxLabel = wrapper.find('.van-checkbox')[3].find('.van-checkbox__label')[0];
-    lastCheckboxLabel.simulate('click');
+    lastCheckboxLabel.trigger('click');
 
     wrapper.update();
     wrapper.vm.$nextTick(() => {
@@ -121,7 +121,7 @@ describe('Checkbox', () => {
     const eventStub = sinon.stub(wrapper.vm, '$emit');
 
     const checkboxLabel = wrapper.find('.van-checkbox__label')[0];
-    checkboxLabel.simulate('click');
+    checkboxLabel.trigger('click');
 
     wrapper.update();
     wrapper.vm.$nextTick(() => {
@@ -145,7 +145,7 @@ describe('Checkbox', () => {
     expect(wrapper.vm.isDisabled).to.be.true;
 
     const checkboxLabel = wrapper.find('.van-checkbox__label')[0];
-    checkboxLabel.simulate('click');
+    checkboxLabel.trigger('click');
 
     expect(wrapper.vm.currentValue).to.be.false;
   });

test/unit/specs/field.spec.js

@@ -60,7 +60,7 @@ describe('Field', () => {
 
     const eventStub = sinon.stub(wrapper.vm, '$emit');
     const input = wrapper.find('.van-field__control')[0];
-    input.simulate('focus');
+    input.trigger('focus');
 
     wrapper.update();
     wrapper.vm.$nextTick(() => {
@@ -79,7 +79,7 @@ describe('Field', () => {
     const input = wrapper.find('.van-field__control')[0];
 
     input.element.value = 'test';
-    input.simulate('input');
+    input.trigger('input');
 
     wrapper.update();
     wrapper.vm.$nextTick(() => {
@@ -117,7 +117,7 @@ describe('Field', () => {
           parseInt(textareaElement.style.paddingTop, 10)) || 0;
 
     textareaElement.value = 'test';
-    textarea.simulate('input');
+    textarea.trigger('input');
 
     wrapper.update();
     wrapper.vm.$nextTick(() => {

test/unit/specs/icon.spec.js

@@ -27,7 +27,7 @@ describe('Icon', () => {
     });
 
     const eventStub = sinon.stub(wrapper.vm, '$emit');
-    wrapper.simulate('click');
+    wrapper.trigger('click');
 
     expect(eventStub.calledOnce).to.be.true;
     expect(eventStub.calledWith('click')).to.be.true;

test/unit/specs/image-preview.spec.js

@@ -25,9 +25,9 @@ describe('ImagePreview', () => {
     setTimeout(() => {
       const image = document.querySelector('.van-image-preview');
       const avImage = new Wrapper({ elm: image }, () => {}, false);
-      avImage.simulate('click');
-      avImage.simulate('touchstart');
-      avImage.simulate('touchend');
+      avImage.trigger('click');
+      avImage.trigger('touchstart');
+      avImage.trigger('touchend');
       setTimeout(() => {
         expect(document.querySelector('.van-image-preview').__vue__.$parent.value).to.be.false;
         expect(document.body.style.overflow).to.equal('');
@@ -49,9 +49,9 @@ describe('ImagePreview', () => {
     setTimeout(() => {
       const image = document.querySelector('.van-image-preview');
       const avImage = new Wrapper({ elm: image }, () => {}, false);
-      avImage.simulate('click');
-      avImage.simulate('touchstart');
-      avImage.simulate('touchend');
+      avImage.trigger('click');
+      avImage.trigger('touchstart');
+      avImage.trigger('touchend');
 
       setTimeout(() => {
         expect(document.querySelector('.van-image-preview').__vue__.$parent.value).to.be.false;

test/unit/specs/layout.spec.js

@@ -13,7 +13,7 @@ describe('Layout', () => {
     wrapper = mount(Row);
 
     expect(wrapper.hasClass('van-row')).to.be.true;
-    expect(wrapper.computed().style()).to.be.empty;
+    expect(wrapper.vm.style).to.be.empty;
   });
 
   it('create a simple column', () => {
@@ -26,7 +26,7 @@ describe('Layout', () => {
     expect(wrapper.hasClass('van-col')).to.be.true;
     expect(wrapper.hasClass('van-col-8')).to.be.true;
     expect(wrapper.hasClass('van-col-offset-8')).to.be.true;
-    expect(wrapper.computed().gutter()).to.equal(0);
+    expect(wrapper.vm.gutter).to.equal(0);
   });
 
   it('create a gutter row', () => {

test/unit/specs/picker.spec.js

@@ -124,7 +124,7 @@ describe('Picker', () => {
 
     const eventStub = sinon.stub(wrapper.vm, '$emit');
     const cancelBtn = wrapper.find('.van-picker__cancel')[0];
-    cancelBtn.simulate('click');
+    cancelBtn.trigger('click');
 
     wrapper.vm.$nextTick(() => {
       expect(eventStub.calledOnce).to.be.true;
@@ -145,7 +145,7 @@ describe('Picker', () => {
 
     const eventStub = sinon.stub(wrapper.vm, '$emit');
     const cancelBtn = wrapper.find('.van-picker__confirm')[0];
-    cancelBtn.simulate('click');
+    cancelBtn.trigger('click');
 
     wrapper.vm.$nextTick(() => {
       expect(eventStub.calledOnce).to.be.true;

test/unit/specs/quantity.spec.js

@@ -19,12 +19,12 @@ describe('Quantity', () => {
     expect(wrapper.data().currentValue).to.equal(1);
 
     const plusButton = wrapper.find('.van-quantity__plus')[0];
-    plusButton.simulate('click');
+    plusButton.trigger('click');
 
     expect(wrapper.data().currentValue).to.equal(2);
 
     const minusButton = wrapper.find('.van-quantity__minus')[0];
-    minusButton.simulate('click');
+    minusButton.trigger('click');
     expect(wrapper.data().currentValue).to.equal(1);
   });
 
@@ -40,7 +40,7 @@ describe('Quantity', () => {
     expect(minusButton.hasClass('van-quantity__minus--disabled')).to.be.true;
 
     const eventStub = sinon.stub(wrapper.vm, '$emit');
-    minusButton.simulate('click');
+    minusButton.trigger('click');
 
     wrapper.update();
     wrapper.vm.$nextTick(() => {
@@ -51,7 +51,7 @@ describe('Quantity', () => {
     const plusButton = wrapper.find('.van-quantity__plus')[0];
     expect(plusButton.hasClass('van-quantity__plus--disabled')).to.be.true;
 
-    plusButton.simulate('click');
+    plusButton.trigger('click');
 
     wrapper.update();
     wrapper.vm.$nextTick(() => {
@@ -109,7 +109,7 @@ describe('Quantity', () => {
 
     const input = wrapper.find('.van-quantity__input')[0];
     input.element.value = 2;
-    input.simulate('input');
+    input.trigger('input');
 
     wrapper.update();
     wrapper.vm.$nextTick(() => {

test/unit/specs/radio.spec.js

@@ -41,7 +41,7 @@ describe('RadioGroup', () => {
     const eventStub = sinon.stub(wrapper.vNode.child, '$emit');
 
     const uncheckedRadioLabel = wrapper.find('.van-radio')[1].find('.van-radio__label')[0];
-    uncheckedRadioLabel.simulate('click');
+    uncheckedRadioLabel.trigger('click');
 
     wrapper.update();
     wrapper.vm.$nextTick(() => {
@@ -85,7 +85,7 @@ describe('Radio', () => {
     expect(wrapper.hasClass('van-radio')).to.be.true;
     const eventStub = sinon.stub(wrapper.vm, '$emit');
 
-    wrapper.simulate('click');
+    wrapper.trigger('click');
     wrapper.update();
     wrapper.vm.$nextTick(() => {
       expect(eventStub.calledOnce).to.be.true;
@@ -107,7 +107,7 @@ describe('Radio', () => {
     const eventStub = sinon.stub(wrapper.vm, '$emit');
 
     const checkboxLabel = wrapper.find('.van-radio__label')[0];
-    checkboxLabel.simulate('click');
+    checkboxLabel.trigger('click');
 
     wrapper.update();
     wrapper.vm.$nextTick(() => {
@@ -132,7 +132,7 @@ describe('Radio', () => {
     expect(wrapper.instance().isDisabled).to.be.true;
 
     const checkboxLabel = wrapper.find('.van-radio__label')[0];
-    checkboxLabel.simulate('click');
+    checkboxLabel.trigger('click');
 
     expect(wrapper.instance().currentValue).to.equal('1');
   });

test/unit/specs/search.spec.js

@@ -20,7 +20,7 @@ describe('Search', () => {
     wrapper = mount(Search);
 
     const input = wrapper.find('.van-search__input')[0];
-    input.simulate('focus');
+    input.trigger('focus');
 
     expect(wrapper.data().isFocus).to.be.true;
   });
@@ -46,10 +46,10 @@ describe('Search', () => {
     expect(wrapper.data().value).to.be.equal('test');
 
     const input = wrapper.find('.van-search__input')[0];
-    input.simulate('focus');
+    input.trigger('focus');
 
     const cleanBtn = wrapper.find('.van-icon-clear')[0];
-    cleanBtn.simulate('click');
+    cleanBtn.trigger('click');
     expect(wrapper.data().value).to.equal('');
     expect(wrapper.data().focusStatus).to.be.true;
   });
@@ -63,10 +63,10 @@ describe('Search', () => {
     const eventStub = sinon.stub(wrapper.vm, '$emit');
 
     const input = wrapper.find('.van-search__input')[0];
-    input.simulate('focus');
+    input.trigger('focus');
 
     const cancelBtn = wrapper.find('.van-search__cancel')[0];
-    cancelBtn.simulate('click');
+    cancelBtn.trigger('click');
 
     wrapper.vm.$nextTick(() => {
       expect(wrapper.data().value).to.be.equal('');
@@ -84,7 +84,7 @@ describe('Search', () => {
     const eventStub = sinon.stub(wrapper.vm, '$emit');
 
     const input = wrapper.find('.van-search__input')[0];
-    input.simulate('keyup.enter');
+    input.trigger('keyup.enter');
 
     wrapper.vm.$nextTick(() => {
       expect(eventStub.calledOnce).to.be.true;
@@ -104,7 +104,7 @@ describe('Search', () => {
     expect(wrapper.hasClass('van-search--showcase')).to.be.true;
 
     const input = wrapper.find('.van-search__input')[0];
-    input.simulate('focus');
+    input.trigger('focus');
 
     expect(wrapper.data().isFocus).to.be.true;
 

test/unit/specs/switch.spec.js

@@ -53,7 +53,7 @@ describe('Switch', () => {
     });
 
     expect(wrapper.hasClass('van-switch--on')).to.be.true;
-    wrapper.simulate('click');
+    wrapper.trigger('click');
     expect(wrapper.hasClass('van-switch--on')).to.be.true;
   });
 
@@ -77,7 +77,7 @@ describe('Switch', () => {
     });
 
     expect(wrapper.hasClass('van-switch--off')).to.be.true;
-    wrapper.simulate('click');
+    wrapper.trigger('click');
     expect(wrapper.hasClass('van-switch--off')).to.be.true;
   });
 
@@ -89,7 +89,7 @@ describe('Switch', () => {
     });
 
     expect(wrapper.hasClass('van-switch--off')).to.be.true;
-    wrapper.simulate('click');
+    wrapper.trigger('click');
     expect(wrapper.hasClass('van-switch--on')).to.be.true;
   });
 
@@ -103,7 +103,7 @@ describe('Switch', () => {
     });
 
     expect(wrapper.hasClass('van-switch--off')).to.be.true;
-    wrapper.simulate('click');
+    wrapper.trigger('click');
     expect(wrapper.hasClass('van-switch--off')).to.be.true;
     expect(stub.calledOnce).to.be.true;
     expect(stub.calledWith(true));

test/unit/specs/tabs.spec.js

@@ -47,7 +47,7 @@ describe('Tabs', () => {
 
     wrapper.vm.$nextTick(() => {
       const nTab = wrapper.find('.van-tab')[0];
-      nTab.simulate('click');
+      nTab.trigger('click');
       expect(clickSpy.calledOnce).to.be.true;
       done();
     });
@@ -63,7 +63,7 @@ describe('Tabs', () => {
 
     wrapper.vm.$nextTick(() => {
       const nTab = wrapper.find('.van-tab')[2];
-      nTab.simulate('click');
+      nTab.trigger('click');
       expect(clickDisabledSpy.calledOnce).to.be.true;
       done();
     });