Browse Source

Merge branch 'v2-dev' of https://github.com/jdf2e/nutui into v2-dev

richard1015 5 years ago
parent
commit
400fef7ffb
2 changed files with 36 additions and 34 deletions
  1. 31 33
      src/packages/noticebar/__test__/noticebar.spec.js
  2. 5 1
      src/packages/rate/rate.vue

+ 31 - 33
src/packages/noticebar/__test__/noticebar.spec.js

@@ -1,42 +1,40 @@
-import { shallowMount } from '@vue/test-utils'
-import NoticeBar from '../noticebar.vue'
+import { shallowMount } from '@vue/test-utils';
+import NoticeBar from '../noticebar.vue';
 import Vue from 'vue';
 
 describe('noticebar.vue', () => {
-    const wrapper = shallowMount(NoticeBar, {
-        propsData: {
-            text: "华为畅享9新品即将上市,活动期间0元预约可参与抽奖,赢HUAWEI WATCH等好礼,更多产品信息请持续关注!"
-        }
-    });
-
-    it('禁用滚动', () => {
-        wrapper.setProps({
-            scrollable: false
-        });
+  const wrapper = shallowMount(NoticeBar, {
+    propsData: {
+      text: '华为畅享9新品即将上市,活动期间0元预约可参与抽奖,赢HUAWEI WATCH等好礼,更多产品信息请持续关注!',
+    },
+  });
 
-        return Vue.nextTick().then(function () {
-            // console.log(wrapper.find('.content').classes('van-ellipsis'),'test');
+  it('禁用滚动', () => {
+    wrapper.setProps({
+      scrollable: false,
+    });
 
-            expect(wrapper.find('.content').classes('nut-ellipsis')).toBe(true);
-        })
+    return Vue.nextTick().then(function () {
+      expect(wrapper.find('.content').classes('nut-ellipsis')).toBe(true);
     });
+  });
 
-    it('通告栏模式--关闭模式', () => {
-        wrapper.setProps({
-            closeMode: true
-        });
+  it('通告栏模式--关闭模式', () => {
+    wrapper.setProps({
+      closeMode: true,
+    });
 
-        return Vue.nextTick().then(function () {
-            expect(wrapper.find('.right-icon').isVisible()).toBe(true);
-        })
-    })
+    return Vue.nextTick().then(function () {
+      expect(wrapper.find('.right-icon').isVisible()).toBe(true);
+    });
+  });
 
-    it('左边图标不显示', () => {
-        wrapper.setProps({
-            leftIcon: 'close',
-        });
-        return Vue.nextTick().then(function () {
-            expect(wrapper.find('.left-icon').exists()).toBe(false);
-        })
-    })
-});
+  it('左边图标不显示', () => {
+    wrapper.setProps({
+      leftIcon: 'close',
+    });
+    return Vue.nextTick().then(function () {
+      expect(wrapper.find('.left-icon').exists()).toBe(false);
+    });
+  });
+});

+ 5 - 1
src/packages/rate/rate.vue

@@ -64,7 +64,11 @@ export default {
         this.$emit('input', this.current);
         this.$emit('click', this.current);
       } else {
-        this.current = idx;
+        if (this.current == idx) {
+          this.current = 0;
+        } else {
+          this.current = idx;
+        }
         this.$emit('input', idx);
         this.$emit('click', idx);
       }