Merge pull request #1459 from OpenGeoscience/upgrade-jasmine

test: Update jasmine

Author: manthey

package-lock.json

@@ -62,7 +62,7 @@
     "istanbul-lib-coverage": "^3.2.0",
     "istanbul-lib-report": "^3.0.1",
     "istanbul-reports": "^3.1.6",
-    "jasmine-core": "^5.0.0",
+    "jasmine-core": "^6.1.0",
     "js-yaml": "^4.1.0",
     "jsdoc": "^4.0.0",
     "jsdoc-autoprivate": "0.0.1",

package.json

@@ -46,7 +46,7 @@ describe('geo.core.osmLayer', function () {
           done: () => done()
         });
       });
-      it('next animation', function (done) {
+      it('next animation 1', function (done) {
         map.transition({
           center: {x: 37.6167, y: 55.7500},
           duration: 500,
@@ -56,7 +56,7 @@ describe('geo.core.osmLayer', function () {
           done: () => done()
         });
       });
-      it('next animation', function (done) {
+      it('next animation 2', function (done) {
         map.transition({
           center: {x: 28.9550, y: 41.0136},
           duration: 500,
@@ -80,7 +80,7 @@ describe('geo.core.osmLayer', function () {
           done: () => done()
         });
       });
-      it('next animation', function (done) {
+      it('next animation 3', function (done) {
         map.transition({
           center: {x: 37.6167, y: 55.7500},
           duration: 500,
@@ -90,7 +90,7 @@ describe('geo.core.osmLayer', function () {
           done: () => done()
         });
       });
-      it('next animation', function (done) {
+      it('next animation 4', function (done) {
         map.transition({
           center: {x: 19.0514, y: 47.4925},
           rotation: Math.PI * 2,
@@ -256,18 +256,18 @@ describe('geo.core.osmLayer', function () {
        */
       var angles = {0: 21, 180: 21};
       $.each(angles, function (angle, numTiles) {
-        it('null default', function () {
+        it(`null default ${angle}`, function () {
           map = create_map();
           if (angle) {
             map.rotation(parseFloat(angle) * Math.PI / 180);
           }
           layer = map.createLayer('osm', {renderer: null, url: '/testdata/white.jpg'});
           expect(map.node().find('[data-tile-layer="0"]').length).toBe(1);
         });
-        waitForIt('null tiles to load', function () {
+        waitForIt(`null tiles to load ${angle}`, function () {
           return $('[tile-reference]').length === numTiles;
         });
-        it('check null tiles and switch to svg', function () {
+        it(`check null tiles and switch to svg ${angle}`, function () {
           positions = {};
           $.each($('[tile-reference]'), function () {
             var ref = $(this).attr('tile-reference').split('_').slice(0, 3).join('_');
@@ -277,10 +277,10 @@ describe('geo.core.osmLayer', function () {
           layer = map.createLayer('osm', {renderer: 'svg', url: '/testdata/white.jpg'});
           expect(map.node().find('[data-tile-layer="0"]').length).toBe(0);
         });
-        waitForIt('svg tiles to load', function () {
+        waitForIt(`svg tiles to load ${angle}`, function () {
           return $('image[reference]').length === numTiles;
         });
-        it('compare tile offsets at angle ' + angle, function () {
+        it(`compare tile offsets at angle ${angle}`, function () {
           $.each($('image[reference]'), function () {
             var ref = $(this).attr('reference').split('_').slice(0, 3).join('_');
             /* Only check the top level */
@@ -291,7 +291,7 @@ describe('geo.core.osmLayer', function () {
             }
           });
         });
-        it('destroy', destroy_map);
+        it(`destroy ${angle}`, destroy_map);
       });
     });
   });
@@ -405,7 +405,7 @@ describe('geo.core.osmLayer', function () {
       layer.baseQuad = undefined;
       expect(layer.baseQuad).toBe(undefined);
     });
-    it('destroy', destroy_map);
+    it('destroy 2', destroy_map);
   });
 
   describe('geo.webgl.osmLayer', function () {
@@ -474,7 +474,7 @@ describe('geo.core.osmLayer', function () {
     waitForIt('map to draw after visible true', function () {
       return Object.keys(layer.activeTiles).length === 25;
     });
-    it('destroy', destroy_map);
+    it('destroy 2', destroy_map);
   });
 
   describe('osmLayer', function () {

tests/cases/osmLayer.js

@@ -629,11 +629,6 @@ describe('geo.tileLayer', function () {
           {x: 3, y: 0, level: 1},
           true
         ));
-        it.apply(it, checkValidTile(
-          opts,
-          {x: 3, y: 0, level: 1},
-          true
-        ));
         it.apply(it, checkValidTile(
           opts,
           {x: -1, y: 0, level: 1},

tests/cases/tileLayer.js

@@ -5,7 +5,7 @@ describe('geo.version', function () {
   });
 });
 
-describe('geo.version', function () {
+describe('geo.sha', function () {
   var geo = require('../test-utils').geo;
   it('Git SHA is defined', function () {
     expect(geo.sha).toMatch(/^[0-9a-f]{8,}$/);

tests/cases/version.js

@@ -1,4 +1,4 @@
-describe('svgLines', function () {
+describe('d3Vectors', function () {
   var imageTest = require('../image-test');
   var common = require('../test-common');
   var geo = require('../test-utils').geo;

tests/gl-cases/d3Vectors.js

@@ -8,6 +8,8 @@ var geo = require('../src');
 
 module.exports = {};
 
+const _waitCounts = {};
+
 /**
  * Provides a uniform entry point into the geojs library.
  */
@@ -25,7 +27,13 @@ module.exports.vgl = geo.vgl;
  */
 module.exports.waitForIt = function waitForIt(desc, testFunc) {
   'use strict';
-  it('wait for ' + desc, function (done) {
+  if (!_waitCounts[desc]) {
+    _waitCounts[desc] = 1;
+  } else {
+    _waitCounts[desc] += 1;
+  }
+  const countStr = _waitCounts[desc] === 1 ? '' : ` ${_waitCounts[desc]}`;
+  it(`wait for ${desc}${countStr}`, function (done) {
     var interval;
     interval = setInterval(function () {
       if (testFunc()) {
@@ -35,7 +43,7 @@ module.exports.waitForIt = function waitForIt(desc, testFunc) {
       }
     }, 10);
   });
-  it('done waiting for ' + desc, function () {
+  it(`done waiting for ${desc}${countStr}`, function () {
     expect(!!(testFunc ? testFunc() : true)).toBe(true);
   });
 };