@whitewizard/countdown 1.1.0 → 1.1.2

package/countdown.vue

@@ -72,7 +72,7 @@
     },
     methods: {
       getDatePart(i) {
-        return this.getDiffArray[i].padStart(2, '0');
+        return this.getDiffArray && this.getDiffArray[i] && this.getDiffArray[i].toString() && this.getDiffArray[i].toString().padStart(2, '0') || '00';
       },
       getSeparator(i) {
         if (typeof this.separators !== 'string' && this.separators.length === 2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whitewizard/countdown",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Universal countdown Vue component",
   "main": "countdown.vue",
   "scripts": {
@@ -27,8 +27,5 @@
     "vue-loader": "^13.3.0",
     "vue-template-compiler": "^2.5.2",
     "webpack": "^3.8.1"
-  },
-  "pre-commit": [
-    "test"
-  ]
+  }
 }

package/test/Countdown.test.js

@@ -6,89 +6,96 @@ import moment from 'moment';
 Vue.config.productionTip = false;
 Vue.config.devtools = false;
 
-function getViewModel (Component, propsData) {
-  const Constructor = Vue.extend(Component);
-  return new Constructor({ propsData }).$mount();
+function getViewModel(Component, propsData) {
+    const Constructor = Vue.extend(Component);
+    return new Constructor({propsData}).$mount();
 }
 
 describe('Countdown component: ', () => {
-  describe('computed properties: ', () => {
-    
-    it('getDateDataParts returns correct array of dateparts', () => {
-      const format = ['h', 'm', 's'];
-      
-      let res = Countdown.computed.getDateDataParts.call({format: format.join(':')});
-      assert.deepEqual(res, format);
-    });
-    
-    it('getSeparators returns correct array of separators', () => {
-      const separators = ['h', 'min', 'sekundit'];
-      
-      let res = Countdown.computed.getSeparators.call({separators: separators.join(':')});
-      assert.deepEqual(res, separators);
-    });
-    
-    it('hasCountDownEnded returns true if timeDiff is < 1000', (done) => {
-      const hasCountDownEnded = (timeDiff) => Countdown.computed.hasCountDownEnded.call({timeDiff});
-
-      assert.isTrue(hasCountDownEnded(0));
-      assert.isTrue(hasCountDownEnded(-2000));
-      assert.isTrue(hasCountDownEnded(999));
-      assert.isFalse(hasCountDownEnded(1000));
-      assert.isFalse(hasCountDownEnded(1001));
-      assert.isFalse(hasCountDownEnded(5000));
-      done();
-    });
-    
-    it('getDiffArray returns correct array', () => {
-      const format = ['minutes', 'seconds'];
-      const getDiffArray = (timeDiff) => Countdown.computed.getDiffArray.call({
-        timeDiff,
-        getDateDataParts: format
-      });
-      
-      assert.lengthOf(getDiffArray(0), 0, 'returns empty array if timeDiff is 0');
-      assert.lengthOf(getDiffArray(12345), format.length, 'array has same length as format');
-      assert.deepEqual(getDiffArray(1000*60*60*2 + 1000*60 + 1000*4), [121, 4], 'calculates array members correctly')
-    });
-  });
-  
-  describe('methods: ', () => {
-    it('getDatePart result is correctly padded', () => {
-      const getDatePart = diffArray => Countdown.methods.getDatePart.call({getDiffArray: diffArray}, 1);
-    
-      assert.equal(getDatePart([0, 1, 2]), '01');
-      assert.equal(getDatePart([0, 123, 2]), '123')
-    });
-  
-    it('getSeparator returns correct separator', () => {
-      const separators = ['h', 'm', 's'],
-        res = Countdown.methods.getSeparator.call({separators, getSeparators: separators }, 1);
-    
-      assert.equal(res, 'm');
+    describe('computed properties: ', () => {
+
+        it('getDateDataParts returns correct array of dateparts', () => {
+            const format = ['h', 'm', 's'];
+
+            let res = Countdown.computed.getDateDataParts.call({format: format.join(':')});
+            assert.deepEqual(res, format);
+        });
+
+        it('getSeparators returns correct array of separators', () => {
+            const separators = ['h', 'min', 'sekundit'];
+
+            let res = Countdown.computed.getSeparators.call({separators: separators.join(':')});
+            assert.deepEqual(res, separators);
+        });
+
+        it('hasCountDownEnded returns true if timeDiff is < 1000', (done) => {
+            const hasCountDownEnded = (timeDiff) => Countdown.computed.hasCountDownEnded.call({timeDiff});
+
+            assert.isTrue(hasCountDownEnded(0));
+            assert.isTrue(hasCountDownEnded(-2000));
+            assert.isTrue(hasCountDownEnded(999));
+            assert.isFalse(hasCountDownEnded(1000));
+            assert.isFalse(hasCountDownEnded(1001));
+            assert.isFalse(hasCountDownEnded(5000));
+            done();
+        });
+
+        it('getDiffArray returns correct array', () => {
+            const format = ['minutes', 'seconds'];
+            const getDiffArray = (timeDiff) => Countdown.computed.getDiffArray.call({
+                timeDiff,
+                getDateDataParts: format
+            });
+
+            assert.lengthOf(getDiffArray(0), 0, 'returns empty array if timeDiff is 0');
+            assert.lengthOf(getDiffArray(12345), format.length, 'array has same length as format');
+            assert.deepEqual(getDiffArray(1000 * 60 * 60 * 2 + 1000 * 60 + 1000 * 4), [121, 4], 'calculates array members correctly')
+        });
     });
-  });
-  
-  describe('Countdown functionality: ', () => {
-    it('emits countDownEnd event if timeDiff is < 1000', (done) => {
-      let vm = getViewModel(Countdown, {
-        end: moment().add(500, 'milliseconds').format()
-      }).$mount();
-      
-      vm.$on('countDownEnd', () => {
-        done();
-      })
+
+    describe('methods: ', () => {
+        it('getDatePart result is correctly padded', () => {
+            const getDatePart = diffArray => Countdown.methods.getDatePart.call({getDiffArray: diffArray}, 1);
+
+            assert.equal(getDatePart([0, 1, 2]), '01');
+            assert.equal(getDatePart([0, 123, 2]), '123')
+        });
+
+        it('getSeparator returns correct separator', () => {
+            const getDatePart = (a) => Countdown.methods.getDatePart.call({getDiffArray: [0, 1, 2]}, a),
+                res = Countdown.methods.getSeparator.call({
+                    separators: [
+                        'päeva:tundi:minutit:sekundit',
+                        'päev:tund:minut:sekund',
+                    ],
+                    getSeparators: ['h', 'm', 's'],
+                    getDatePart
+                }, 1);
+
+            assert.equal(res, 'tund');
+        });
     });
-    
-    it('root element has countdown-ended class if timeDiff is < 1000', (done) => {
-      let vm = getViewModel(Countdown, {
-        end: moment().add(100, 'milliseconds').format()
-      }).$mount();
-      
-      vm.$nextTick(() => {
-        assert.isTrue(vm.$el.className.includes('countdown-ended'));
-        done();
-      })
+
+    describe('Countdown functionality: ', () => {
+        it('emits countDownEnd event if timeDiff is < 1000', (done) => {
+            let vm = getViewModel(Countdown, {
+                end: moment().add(50, 'milliseconds').format()
+            }).$mount();
+
+            vm.$on('countDownEnd', () => {
+                done();
+            })
+        });
+
+        it('root element has countdown-ended class if timeDiff is < 1000', (done) => {
+            let vm = getViewModel(Countdown, {
+                end: moment().add(100, 'milliseconds').format()
+            }).$mount();
+
+            vm.$nextTick(() => {
+                assert.isTrue(vm.$el.className.includes('countdown-ended'));
+                done();
+            })
+        })
     })
-  })
 });