fix util.now

maptalks · Oct 4, 2017 · eb99a17 · eb99a17
1 parent 0aba74d
commit eb99a17
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/build/karma.cover.config.js b/build/karma.cover.config.js
@@ -23,7 +23,8 @@ module.exports = function (config) {
         const babel = require('maptalks-rollup-plugin-babel');
         plugins.splice(idx, 1, babel({
             plugins: [['istanbul', {
-                exclude: ['test/**/*.js', 'src/core/mapbox/*.js', 'src/util/dom.js', 'node_modules/**/*']
+                // TileLayerGLRenderer is not testable on CI
+                exclude: ['test/**/*.js', 'src/core/mapbox/*.js', 'src/util/dom.js', 'src/renderer/layer/tilelayer/TileLayerGLRenderer', 'node_modules/**/*']
             }]]
         }));
     }

diff --git a/src/core/util/common.js b/src/core/util/common.js
@@ -1,7 +1,4 @@
 export function now() {
-    if (typeof performance !== 'undefined' && performance.now) {
-        return performance.now();
-    }
     return Date.now();
 }
 

diff --git a/test/core/UtilSpec.js b/test/core/UtilSpec.js
@@ -26,6 +26,13 @@ describe('Util', function () {
         expect(maptalks.Util.sign(2)).to.be.eql(1);
     });
 
+    it('now', function () {
+        var now = Date.now();
+        var now2 = maptalks.Util.now();
+
+        expect(now2 >= now).to.be.ok();
+    });
+
     it('getSymbolStamp', function () {
         var symbol = {
             'markerType' : 'ellipse',