element is re-used
+ expect(beforeIcon).to.equal(afterIcon); // Check that the
element is re-used
expect(afterIcon.innerHTML).to.contain('Inner2Text');
});
@@ -148,15 +148,15 @@ describe('Marker', () => {
marker.setIcon(icon1);
- expect(oldIcon).to.not.be(marker._icon); // Check that the _icon is NOT re-used
- expect(oldIcon.parentNode).to.be(null);
+ expect(oldIcon).to.not.equal(marker._icon); // Check that the _icon is NOT re-used
+ expect(oldIcon.parentNode).to.equal(null);
if (L.Browser.retina) {
expect(marker._icon.src).to.contain('marker-icon-2x.png');
} else {
expect(marker._icon.src).to.contain('marker-icon.png');
}
- expect(marker._icon.parentNode).to.be(map._panes.markerPane);
+ expect(marker._icon.parentNode).to.equal(map._panes.markerPane);
});
it('changes an image to a DivIcon', () => {
@@ -166,11 +166,11 @@ describe('Marker', () => {
marker.setIcon(L.divIcon({html: 'Inner1Text'}));
- expect(oldIcon).to.not.be(marker._icon); // Check that the _icon is NOT re-used
- expect(oldIcon.parentNode).to.be(null);
+ expect(oldIcon).to.not.equal(marker._icon); // Check that the _icon is NOT re-used
+ expect(oldIcon.parentNode).to.equal(null);
expect(marker._icon.innerHTML).to.contain('Inner1Text');
- expect(marker._icon.parentNode).to.be(map._panes.markerPane);
+ expect(marker._icon.parentNode).to.equal(map._panes.markerPane);
});
it('reuses the icon/shadow when changing icon', () => {
@@ -181,26 +181,26 @@ describe('Marker', () => {
marker.setIcon(icon2);
- expect(oldIcon).to.be(marker._icon);
- expect(oldShadow).to.be(marker._shadow);
+ expect(oldIcon).to.equal(marker._icon);
+ expect(oldShadow).to.equal(marker._shadow);
- expect(marker._icon.parentNode).to.be(map._panes.markerPane);
- expect(marker._shadow.parentNode).to.be(map._panes.shadowPane);
+ expect(marker._icon.parentNode).to.equal(map._panes.markerPane);
+ expect(marker._shadow.parentNode).to.equal(map._panes.shadowPane);
});
it('sets the alt attribute to a default value when no alt text is passed', () => {
const marker = L.marker([0, 0], {icon: icon1});
map.addLayer(marker);
const icon = marker._icon;
- expect(icon.hasAttribute('alt')).to.be(true);
- expect(icon.alt).to.be('Marker');
+ expect(icon.hasAttribute('alt')).to.be.true;
+ expect(icon.alt).to.equal('Marker');
});
it('doesn\'t set the alt attribute for DivIcons', () => {
const marker = L.marker([0, 0], {icon: L.divIcon(), alt: 'test'});
map.addLayer(marker);
const icon = marker._icon;
- expect(icon.hasAttribute('alt')).to.be(false);
+ expect(icon.hasAttribute('alt')).to.be.false;
});
it('pan map to focus marker', () => {
@@ -209,7 +209,7 @@ describe('Marker', () => {
expect(() => {
marker._icon.focus();
- }).to.not.throwException();
+ }).to.not.throw();
});
it('pan map to focus marker with no iconSize', () => {
@@ -218,7 +218,7 @@ describe('Marker', () => {
expect(() => {
marker._panOnFocus();
- }).to.not.throwException();
+ }).to.not.throw();
});
});
@@ -238,10 +238,10 @@ describe('Marker', () => {
marker.setLatLng(afterLatLng);
- expect(eventArgs).to.not.be(null);
- expect(eventArgs.oldLatLng).to.be(beforeLatLng);
- expect(eventArgs.latlng).to.be(afterLatLng);
- expect(marker.getLatLng()).to.be(afterLatLng);
+ expect(eventArgs).to.not.equal(null);
+ expect(eventArgs.oldLatLng).to.equal(beforeLatLng);
+ expect(eventArgs.latlng).to.equal(afterLatLng);
+ expect(marker.getLatLng()).to.equal(afterLatLng);
});
});
@@ -254,7 +254,7 @@ describe('Marker', () => {
marker.on('click', spy);
UIEventSimulator.fire('click', marker._icon);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
it('fires click event when clicked with DivIcon', () => {
@@ -265,7 +265,7 @@ describe('Marker', () => {
marker.on('click', spy);
UIEventSimulator.fire('click', marker._icon);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
it('fires click event when clicked on DivIcon child element', () => {
@@ -276,10 +276,10 @@ describe('Marker', () => {
marker.on('click', spy);
UIEventSimulator.fire('click', marker._icon);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
UIEventSimulator.fire('click', marker._icon.querySelector('img'));
- expect(spy.calledTwice).to.be.ok();
+ expect(spy.calledTwice).to.be.true;
});
it('fires click event when clicked on DivIcon child element set using setIcon', () => {
@@ -291,10 +291,10 @@ describe('Marker', () => {
marker.on('click', spy);
UIEventSimulator.fire('click', marker._icon);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
UIEventSimulator.fire('click', marker._icon.querySelector('img'));
- expect(spy.calledTwice).to.be.ok();
+ expect(spy.calledTwice).to.be.true;
});
it('do not propagate click event', () => {
@@ -307,9 +307,9 @@ describe('Marker', () => {
marker.on('click', spy2);
map.on('click', mapSpy);
UIEventSimulator.fire('click', marker._icon);
- expect(spy.called).to.be.ok();
- expect(spy2.called).to.be.ok();
- expect(mapSpy.called).not.to.be.ok();
+ expect(spy.called).to.be.true;
+ expect(spy2.called).to.be.true;
+ expect(mapSpy.called).not.to.be.true;
});
it('do not propagate dblclick event', () => {
@@ -322,9 +322,9 @@ describe('Marker', () => {
marker.on('dblclick', spy2);
map.on('dblclick', mapSpy);
UIEventSimulator.fire('dblclick', marker._icon);
- expect(spy.called).to.be.ok();
- expect(spy2.called).to.be.ok();
- expect(mapSpy.called).not.to.be.ok();
+ expect(spy.called).to.be.true;
+ expect(spy2.called).to.be.true;
+ expect(mapSpy.called).not.to.be.true;
});
it('do not catch event if it does not listen to it', (done) => {
diff --git a/spec/suites/layer/tile/GridLayerSpec.js b/spec/suites/layer/tile/GridLayerSpec.js
index ff3427766..0bc5453e0 100644
--- a/spec/suites/layer/tile/GridLayerSpec.js
+++ b/spec/suites/layer/tile/GridLayerSpec.js
@@ -167,7 +167,7 @@ describe('GridLayer', () => {
grid.on('tileload', tileLoadRaised);
grid.on('tileerror', () => {
if (keys.length === 4) {
- expect(tileLoadRaised.notCalled).to.be(true);
+ expect(tileLoadRaised.notCalled).to.be.true;
done();
}
});
@@ -179,7 +179,7 @@ describe('GridLayer', () => {
grid.on('tileerror', () => {
tileErrorRaised();
if (keys.length === 4) {
- expect(tileErrorRaised.callCount).to.be(4);
+ expect(tileErrorRaised.callCount).to.equal(4);
done();
}
});
@@ -193,7 +193,7 @@ describe('GridLayer', () => {
count++;
}
if (keys.length === 4) {
- expect(count).to.be(4);
+ expect(count).to.equal(4);
done();
}
});
@@ -218,7 +218,7 @@ describe('GridLayer', () => {
map.on('zoomend', onReset);
map.setView([0, 0], 0);
- expect(onReset.calledBefore(onAddSpy)).to.be.ok();
+ expect(onReset.calledBefore(onAddSpy)).to.be.true;
});
});
@@ -237,36 +237,36 @@ describe('GridLayer', () => {
minZoom
}).addTo(map);
- expect(map.getMaxZoom()).to.be(maxZoom);
- expect(map.getMinZoom()).to.be(minZoom);
+ expect(map.getMaxZoom()).to.equal(maxZoom);
+ expect(map.getMinZoom()).to.equal(minZoom);
});
});
describe('accessing a gridlayer\'s properties', () => {
it('provides a container', () => {
const layer = L.gridLayer().addTo(map);
- expect(layer.getContainer()).to.be.ok();
+ expect(layer.getContainer()).to.be.ok;
});
});
describe('when a gridlayer is added to a map that already has a gridlayer', () => {
it('has its zoomlevels updated to fit the new layer', () => {
L.gridLayer({minZoom: 10, maxZoom: 15}).addTo(map);
- expect(map.getMinZoom()).to.be(10);
- expect(map.getMaxZoom()).to.be(15);
+ expect(map.getMinZoom()).to.equal(10);
+ expect(map.getMaxZoom()).to.equal(15);
L.gridLayer({minZoom: 5, maxZoom: 10}).addTo(map);
- expect(map.getMinZoom()).to.be(5); // changed
- expect(map.getMaxZoom()).to.be(15); // unchanged
+ expect(map.getMinZoom()).to.equal(5); // changed
+ expect(map.getMaxZoom()).to.equal(15); // unchanged
L.gridLayer({minZoom: 10, maxZoom: 20}).addTo(map);
- expect(map.getMinZoom()).to.be(5); // unchanged
- expect(map.getMaxZoom()).to.be(20); // changed
+ expect(map.getMinZoom()).to.equal(5); // unchanged
+ expect(map.getMaxZoom()).to.equal(20); // changed
L.gridLayer({minZoom: 0, maxZoom: 25}).addTo(map);
- expect(map.getMinZoom()).to.be(0); // changed
- expect(map.getMaxZoom()).to.be(25); // changed
+ expect(map.getMinZoom()).to.equal(0); // changed
+ expect(map.getMaxZoom()).to.equal(25); // changed
});
});
@@ -278,24 +278,24 @@ describe('GridLayer', () => {
L.gridLayer({minZoom: 10, maxZoom: 20}).addTo(map),
L.gridLayer({minZoom: 0, maxZoom: 25}).addTo(map)
];
- expect(map.getMinZoom()).to.be(0);
- expect(map.getMaxZoom()).to.be(25);
+ expect(map.getMinZoom()).to.equal(0);
+ expect(map.getMaxZoom()).to.equal(25);
map.removeLayer(tiles[0]);
- expect(map.getMinZoom()).to.be(0);
- expect(map.getMaxZoom()).to.be(25);
+ expect(map.getMinZoom()).to.equal(0);
+ expect(map.getMaxZoom()).to.equal(25);
map.removeLayer(tiles[3]);
- expect(map.getMinZoom()).to.be(5);
- expect(map.getMaxZoom()).to.be(20);
+ expect(map.getMinZoom()).to.equal(5);
+ expect(map.getMaxZoom()).to.equal(20);
map.removeLayer(tiles[2]);
- expect(map.getMinZoom()).to.be(5);
- expect(map.getMaxZoom()).to.be(10);
+ expect(map.getMinZoom()).to.equal(5);
+ expect(map.getMaxZoom()).to.equal(10);
map.removeLayer(tiles[1]);
- expect(map.getMinZoom()).to.be(0);
- expect(map.getMaxZoom()).to.be(Infinity);
+ expect(map.getMinZoom()).to.equal(0);
+ expect(map.getMaxZoom()).to.equal(Infinity);
});
});
});
@@ -310,7 +310,7 @@ describe('GridLayer', () => {
let tileCount = 0;
grid.createTile = function (coords) {
- expect(coords.z).to.be(5);
+ expect(coords.z).to.equal(5);
tileCount++;
return document.createElement('div');
};
@@ -334,7 +334,7 @@ describe('GridLayer', () => {
let tileCount = 0;
grid.createTile = function (coords) {
- expect(coords.z).to.be(5);
+ expect(coords.z).to.equal(5);
tileCount++;
return document.createElement('div');
};
@@ -354,11 +354,11 @@ describe('GridLayer', () => {
map.setView([0, 0], initialZoom);
const grid = L.gridLayer().addTo(map);
- expect(grid._tileZoom).to.be(initialZoom);
+ expect(grid._tileZoom).to.equal(initialZoom);
grid.options.maxNativeZoom = 11;
grid.redraw();
- expect(grid._tileZoom).to.be(11);
+ expect(grid._tileZoom).to.equal(11);
});
});
@@ -408,9 +408,9 @@ describe('GridLayer', () => {
it('Loads 8 tiles zoom 1', (done) => {
grid.on('load', () => {
- expect(counts.tileloadstart).to.be(8);
- expect(counts.tileload).to.be(8);
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileloadstart).to.equal(8);
+ expect(counts.tileload).to.equal(8);
+ expect(counts.tileunload).to.equal(0);
done();
});
@@ -420,9 +420,9 @@ describe('GridLayer', () => {
it('Loads 5 tiles zoom 0', (done) => {
grid.on('load', () => {
- expect(counts.tileloadstart).to.be(5);
- expect(counts.tileload).to.be(5);
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileloadstart).to.equal(5);
+ expect(counts.tileload).to.equal(5);
+ expect(counts.tileunload).to.equal(0);
done();
});
@@ -432,9 +432,9 @@ describe('GridLayer', () => {
it('Loads 16 tiles zoom 10', (done) => {
grid.on('load', () => {
- expect(counts.tileloadstart).to.be(16);
- expect(counts.tileload).to.be(16);
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileloadstart).to.equal(16);
+ expect(counts.tileload).to.equal(16);
+ expect(counts.tileunload).to.equal(0);
grid.off();
done();
@@ -446,15 +446,15 @@ describe('GridLayer', () => {
it('Loads 32, unloads 16 tiles zooming in 10-11', (done) => {
grid.on('load', () => {
- expect(counts.tileloadstart).to.be(16);
- expect(counts.tileload).to.be(16);
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileloadstart).to.equal(16);
+ expect(counts.tileload).to.equal(16);
+ expect(counts.tileunload).to.equal(0);
grid.off('load');
grid.on('load', () => {
- expect(counts.tileloadstart).to.be(32);
- expect(counts.tileload).to.be(32);
- expect(counts.tileunload).to.be(16);
+ expect(counts.tileloadstart).to.equal(32);
+ expect(counts.tileload).to.equal(32);
+ expect(counts.tileunload).to.equal(16);
done();
});
@@ -469,15 +469,15 @@ describe('GridLayer', () => {
it('Loads 32, unloads 16 tiles zooming out 11-10', (done) => {
grid.on('load', () => {
- expect(counts.tileloadstart).to.be(16);
- expect(counts.tileload).to.be(16);
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileloadstart).to.equal(16);
+ expect(counts.tileload).to.equal(16);
+ expect(counts.tileunload).to.equal(0);
grid.off('load');
grid.on('load', () => {
- expect(counts.tileloadstart).to.be(32);
- expect(counts.tileload).to.be(32);
- expect(counts.tileunload).to.be(16);
+ expect(counts.tileloadstart).to.equal(32);
+ expect(counts.tileload).to.equal(32);
+ expect(counts.tileunload).to.equal(16);
done();
});
@@ -492,15 +492,15 @@ describe('GridLayer', () => {
it('Loads 32, unloads 16 tiles zooming out 18-10', (done) => {
grid.on('load', () => {
- expect(counts.tileloadstart).to.be(16);
- expect(counts.tileload).to.be(16);
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileloadstart).to.equal(16);
+ expect(counts.tileload).to.equal(16);
+ expect(counts.tileunload).to.equal(0);
grid.off('load');
grid.on('load', () => {
- expect(counts.tileloadstart).to.be(32);
- expect(counts.tileload).to.be(32);
- expect(counts.tileunload).to.be(16);
+ expect(counts.tileloadstart).to.equal(32);
+ expect(counts.tileload).to.equal(32);
+ expect(counts.tileunload).to.equal(16);
done();
});
@@ -589,8 +589,8 @@ describe('GridLayer', () => {
// and avoid removing the above logTiles
// (which would happen when calling "grid.off('load')").
grid.once('load', () => {
- expect(counts.tileload).to.be(16);
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileload).to.equal(16);
+ expect(counts.tileunload).to.equal(0);
// Wait for a frame to let _updateOpacity starting.
L.Util.requestAnimFrame(() => {
@@ -601,12 +601,12 @@ describe('GridLayer', () => {
// Date.now() is 301.
grid.once('load', () => {
- expect(counts.tileload).to.be(32);
+ expect(counts.tileload).to.equal(32);
// We're one frame into the zoom animation,
// so GridLayer._setView with noPrune === undefined is not called yet
// No tile should be unloaded yet.
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileunload).to.equal(0);
// Wait > 250msec for the zoom animation to complete,
// which triggers the tile pruning
@@ -619,7 +619,7 @@ describe('GridLayer', () => {
// At 301 + 250 = 551ms, the pruneTile from the end of the zoom animation executes.
// It unloads the 'outside' 12 tiles from z10, but not the 4 tiles in the center,
// since _updateOpacity did not have a chance yet to flag the 16 new z11 tiles as "active".
- expect(counts.tileunload).to.be(12);
+ expect(counts.tileunload).to.equal(12);
// Date.now() is 601.
// Wait for a frame to let _updateOpacity starting
@@ -636,7 +636,7 @@ describe('GridLayer', () => {
clock.tick(300);
// At 851ms, the pruneTile from the end of the z11 tiles fade-in animation executes.
// It unloads the remaining 4 tiles from z10.
- expect(counts.tileunload).to.be(16);
+ expect(counts.tileunload).to.equal(16);
// Date.now() is 901.
done();
});
@@ -646,7 +646,7 @@ describe('GridLayer', () => {
// Animation (and new tiles loading) starts after 1 frame.
L.Util.requestAnimFrame(() => {
// 16 extra tiles from z11 being loaded. Total 16 + 16 = 32.
- expect(counts.tileloadstart).to.be(32);
+ expect(counts.tileloadstart).to.equal(32);
});
});
@@ -655,15 +655,15 @@ describe('GridLayer', () => {
map.addLayer(grid).setView([0, 0], 10);
// The first setView does not animated, therefore it starts loading tiles immediately.
// 16 tiles from z10 being loaded.
- expect(counts.tileloadstart).to.be(16);
+ expect(counts.tileloadstart).to.equal(16);
// At 1ms, first pruneTile (map fires "viewreset" event => GridLayer._resetView => GridLayer._setView => _pruneTiles).
});
it('Loads 32, unloads 16 tiles zooming in 10-18', (done) => {
grid.on('load', () => {
- expect(counts.tileloadstart).to.be(16);
- expect(counts.tileload).to.be(16);
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileloadstart).to.equal(16);
+ expect(counts.tileload).to.equal(16);
+ expect(counts.tileunload).to.equal(0);
grid.off('load');
grid.on('load', () => {
@@ -671,9 +671,9 @@ describe('GridLayer', () => {
// In this particular scenario, the tile unloads happen in the
// next render frame after the grid's 'load' event.
L.Util.requestAnimFrame(() => {
- expect(counts.tileloadstart).to.be(32);
- expect(counts.tileload).to.be(32);
- expect(counts.tileunload).to.be(16);
+ expect(counts.tileloadstart).to.equal(32);
+ expect(counts.tileload).to.equal(32);
+ expect(counts.tileunload).to.equal(16);
done();
});
});
@@ -694,8 +694,8 @@ describe('GridLayer', () => {
// grid.on('tileload tileunload load', logTiles);
grid.once('load', () => {
- expect(counts.tileload).to.be(16);
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileload).to.equal(16);
+ expect(counts.tileunload).to.equal(0);
// Wait for a frame to let _updateOpacity starting.
L.Util.requestAnimFrame(() => {
@@ -706,9 +706,9 @@ describe('GridLayer', () => {
// Date.now() is 301.
grid.once('load', () => {
- expect(counts.tileload).to.be(20);
+ expect(counts.tileload).to.equal(20);
// No tile should be unloaded yet.
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileunload).to.equal(0);
// Wait > 250msec for the zoom animation to complete,
// which triggers the tile pruning, but there are no
@@ -718,8 +718,8 @@ describe('GridLayer', () => {
// At the end of the animation, all 16 tiles from z10
// are loading.
- expect(counts.tileloadstart).to.be(32);
- expect(counts.tileload).to.be(20);
+ expect(counts.tileloadstart).to.equal(32);
+ expect(counts.tileload).to.equal(20);
// Now that the zoom animation is complete,
// the grid is ready to fire a new "load" event
@@ -728,15 +728,15 @@ describe('GridLayer', () => {
// central tiles from z10 as "active", since we are now
// > 200ms after the first "load" event fired.
grid.once('load', () => {
- expect(counts.tileload).to.be(32);
+ expect(counts.tileload).to.equal(32);
// No tile should be unloaded yet.
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileunload).to.equal(0);
// Wait for a frame for next _updateOpacity to prune
// all 16 tiles from z11 which are now covered by the
// 4 central active tiles of z10.
L.Util.requestAnimFrame(() => {
- expect(counts.tileunload).to.be(16);
+ expect(counts.tileunload).to.equal(16);
done();
});
});
@@ -749,21 +749,21 @@ describe('GridLayer', () => {
// We're one frame into the zoom animation, there are
// 16 tiles for z11 plus 4 tiles for z10 covering the
// bounds at the *beginning* of the zoom-*out* anim
- expect(counts.tileloadstart).to.be(20);
+ expect(counts.tileloadstart).to.equal(20);
});
});
map.addLayer(grid).setView([0, 0], 11);
// The first setView does not animated, therefore it starts loading tiles immediately.
// 16 tiles from z10 being loaded.
- expect(counts.tileloadstart).to.be(16);
+ expect(counts.tileloadstart).to.equal(16);
});
it('Loads 32, unloads 16 tiles zooming out 18-10', (done) => {
grid.on('load', () => {
- expect(counts.tileloadstart).to.be(16);
- expect(counts.tileload).to.be(16);
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileloadstart).to.equal(16);
+ expect(counts.tileload).to.equal(16);
+ expect(counts.tileunload).to.equal(0);
grid.off('load');
grid.on('load', () => {
@@ -771,9 +771,9 @@ describe('GridLayer', () => {
// In this particular scenario, the tile unloads happen in the
// next render frame after the grid's 'load' event.
L.Util.requestAnimFrame(() => {
- expect(counts.tileloadstart).to.be(32);
- expect(counts.tileload).to.be(32);
- expect(counts.tileunload).to.be(16);
+ expect(counts.tileloadstart).to.equal(32);
+ expect(counts.tileload).to.equal(32);
+ expect(counts.tileunload).to.equal(16);
done();
});
});
@@ -792,16 +792,16 @@ describe('GridLayer', () => {
const mad = [40.40, -3.7], trd = [63.41, 10.41];
grid.on('load', () => {
- expect(counts.tileloadstart).to.be(12);
- expect(counts.tileload).to.be(12);
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileloadstart).to.equal(12);
+ expect(counts.tileload).to.equal(12);
+ expect(counts.tileunload).to.equal(0);
grid.off('load');
map.on('zoomend', () => {
- expect(counts.tileloadstart).to.be(290);
- expect(counts.tileunload).to.be(275);
- expect(counts.tileload).to.be(290);
- expect(grid._container.querySelectorAll('div').length).to.be(16); // 15 + container
+ expect(counts.tileloadstart).to.equal(290);
+ expect(counts.tileunload).to.equal(275);
+ expect(counts.tileload).to.equal(290);
+ expect(grid._container.querySelectorAll('div').length).to.equal(16); // 15 + container
done();
});
@@ -872,9 +872,9 @@ describe('GridLayer', () => {
// Date.now() is 1.
grid.once('load', () => {
- expect(counts.tileloadstart).to.be(16);
- expect(counts.tileload).to.be(16);
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileloadstart).to.equal(16);
+ expect(counts.tileload).to.equal(16);
+ expect(counts.tileunload).to.equal(0);
// Wait for a frame to let _updateOpacity starting.
L.Util.requestAnimFrame(() => {
@@ -889,13 +889,13 @@ describe('GridLayer', () => {
// Since there is no animation requested,
// We directly jump to the target position.
// => 12 new tiles, total = 16 + 12 = 28 tiles.
- expect(counts.tileloadstart).to.be(28);
- expect(counts.tileload).to.be(28);
+ expect(counts.tileloadstart).to.equal(28);
+ expect(counts.tileload).to.equal(28);
// Wait for a frame to let _updateOpacity starting
// It will prune the 12 tiles outside the new bounds.
L.Util.requestAnimFrame(() => {
- expect(counts.tileunload).to.be(12);
+ expect(counts.tileunload).to.equal(12);
done();
});
});
@@ -923,26 +923,26 @@ describe('GridLayer', () => {
it('Loads map, moves forth and back by 512 px, keepBuffer = 0', (done) => {
grid.once('load', () => {
- expect(counts.tileloadstart).to.be(16);
- expect(counts.tileload).to.be(16);
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileloadstart).to.equal(16);
+ expect(counts.tileload).to.equal(16);
+ expect(counts.tileunload).to.equal(0);
grid.once('load', () => {
- expect(counts.tileloadstart).to.be(28);
- expect(counts.tileload).to.be(28);
+ expect(counts.tileloadstart).to.equal(28);
+ expect(counts.tileload).to.equal(28);
// Wait for a frame to let _updateOpacity starting
// It will prune the 12 tiles outside the new bounds.
L.Util.requestAnimFrame(() => {
- expect(counts.tileunload).to.be(12);
+ expect(counts.tileunload).to.equal(12);
grid.once('load', () => {
- expect(counts.tileloadstart).to.be(40);
- expect(counts.tileload).to.be(40);
+ expect(counts.tileloadstart).to.equal(40);
+ expect(counts.tileload).to.equal(40);
// Wait an extra frame for the tile pruning to happen.
L.Util.requestAnimFrame(() => {
- expect(counts.tileunload).to.be(24);
+ expect(counts.tileunload).to.equal(24);
done();
});
});
@@ -966,15 +966,15 @@ describe('GridLayer', () => {
const spy = sinon.spy();
grid.on('load', () => {
- expect(counts.tileloadstart).to.be(16);
- expect(counts.tileload).to.be(16);
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileloadstart).to.equal(16);
+ expect(counts.tileload).to.equal(16);
+ expect(counts.tileunload).to.equal(0);
grid.off('load');
grid.on('load', () => {
- expect(counts.tileloadstart).to.be(28);
- expect(counts.tileload).to.be(28);
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileloadstart).to.equal(28);
+ expect(counts.tileload).to.equal(28);
+ expect(counts.tileunload).to.equal(0);
grid.off('load');
grid.addEventListener('load', spy);
@@ -982,7 +982,7 @@ describe('GridLayer', () => {
map.panBy([-512, -512], {animate: false});
clock.tick(250);
- expect(spy.called).to.be(false);
+ expect(spy.called).to.be.false;
done();
});
@@ -1064,16 +1064,16 @@ describe('GridLayer', () => {
describe('Sanity checks for infinity', () => {
it('Throws error on map center at plus Infinity longitude', () => {
expect(() => {
- map.setCenter([Infinity, Infinity]);
+ map.panTo([Infinity, Infinity]);
L.gridLayer().addTo(map);
- }).to.throwError('Attempted to load an infinite number of tiles');
+ }).to.throw('Attempted to load an infinite number of tiles');
});
it('Throws error on map center at minus Infinity longitude', () => {
expect(() => {
- map.setCenter([-Infinity, -Infinity]);
+ map.panTo([-Infinity, -Infinity]);
L.gridLayer().addTo(map);
- }).to.throwError('Attempted to load an infinite number of tiles');
+ }).to.throw('Attempted to load an infinite number of tiles');
});
});
@@ -1083,6 +1083,6 @@ describe('GridLayer', () => {
const wrapped = sinon.spy(map, 'getZoomScale');
grid._invalidateAll();
grid.redraw();
- expect(wrapped.neverCalledWith(sinon.match.any, null)).to.be(true);
+ expect(wrapped.neverCalledWith(sinon.match.any, null)).to.be.true;
});
});
diff --git a/spec/suites/layer/tile/TileLayerSpec.js b/spec/suites/layer/tile/TileLayerSpec.js
index 342d9e386..79ec45d3b 100644
--- a/spec/suites/layer/tile/TileLayerSpec.js
+++ b/spec/suites/layer/tile/TileLayerSpec.js
@@ -235,10 +235,10 @@ describe('TileLayer', () => {
it('Loads 8 kittens zoom 1', (done) => {
kittenLayer.on('load', () => {
- expect(counts.tileloadstart).to.be(8);
- expect(counts.tileload).to.be(8);
- expect(counts.tileunload).to.be(0);
- expect(kittenLayer._container.querySelectorAll('img').length).to.be(8);
+ expect(counts.tileloadstart).to.equal(8);
+ expect(counts.tileload).to.equal(8);
+ expect(counts.tileunload).to.equal(0);
+ expect(kittenLayer._container.querySelectorAll('img').length).to.equal(8);
done();
});
@@ -252,19 +252,19 @@ describe('TileLayer', () => {
const mad = [40.40, -3.7], trd = [63.41, 10.41];
kittenLayer.on('load', () => {
- expect(counts.tileloadstart).to.be(12);
- expect(counts.tileload).to.be(12);
- expect(counts.tileunload).to.be(0);
+ expect(counts.tileloadstart).to.equal(12);
+ expect(counts.tileload).to.equal(12);
+ expect(counts.tileunload).to.equal(0);
kittenLayer.off('load');
map.on('zoomend', () => {
- expect(counts.tileloadstart).to.be(290);
- expect(counts.tileunload).to.be(275);
+ expect(counts.tileloadstart).to.equal(290);
+ expect(counts.tileunload).to.equal(275);
// image tiles take time, so then might not be fully loaded yet.
expect(counts.tileload).to.be.lessThan(counts.tileloadstart + 1);
expect(counts.tileload).to.be.greaterThan(counts.tileunload);
- expect(kittenLayer._container.querySelectorAll('img').length).to.be(15);
+ expect(kittenLayer._container.querySelectorAll('img').length).to.equal(15);
done();
});
@@ -336,7 +336,7 @@ describe('TileLayer', () => {
expect(() => {
layer.addTo(simpleMap);
- }).to.throwError('No value provided for variable {-y}');
+ }).to.throw('No value provided for variable {-y}');
simpleMap.remove();
document.body.removeChild(simplediv);
@@ -422,7 +422,7 @@ describe('TileLayer', () => {
}).addTo(map);
eachImg(layer, (img) => {
- expect(img.getAttribute('crossorigin')).to.be(expectedValue);
+ expect(img.getAttribute('crossorigin')).to.equal(expectedValue);
});
});
}
@@ -442,8 +442,8 @@ describe('TileLayer', () => {
});
kittenLayer.on('load', () => {
- expect(kittenLayer.options.maxZoom).to.be(maxZoom);
- expect(kittenLayer.options.minZoom).to.be(minZoom);
+ expect(kittenLayer.options.maxZoom).to.equal(maxZoom);
+ expect(kittenLayer.options.minZoom).to.equal(minZoom);
// reset retina value
L.Browser.retina = originalRetina;
@@ -468,7 +468,7 @@ describe('TileLayer', () => {
kittenLayer.on('load', () => {
// zooms should be identical so that we can load tiles for the given zoom level
- expect(kittenLayer.options.maxZoom).to.be(kittenLayer.options.minZoom);
+ expect(kittenLayer.options.maxZoom).to.equal(kittenLayer.options.minZoom);
// reset retina value
L.Browser.retina = originalRetina;
diff --git a/spec/suites/layer/vector/CanvasSpec.js b/spec/suites/layer/vector/CanvasSpec.js
index 4893fa847..93e1d165d 100644
--- a/spec/suites/layer/vector/CanvasSpec.js
+++ b/spec/suites/layer/vector/CanvasSpec.js
@@ -88,7 +88,7 @@ describe('Canvas', () => {
const spyMap = sinon.spy();
map.on('mousemove', spyMap);
UIEventSimulator.fireAt('mousemove', 151, 151); // empty space
- expect(spyMap.calledOnce).to.be.ok();
+ expect(spyMap.calledOnce).to.be.true;
});
it('should fire preclick before click', () => {
@@ -97,7 +97,7 @@ describe('Canvas', () => {
layer.on('click', clickSpy);
layer.on('preclick', preclickSpy);
layer.once('preclick', () => {
- expect(clickSpy.called).to.be(false);
+ expect(clickSpy.called).to.be.false;
});
UIEventSimulator.fireAt('click', 50, 50); // Click on the layer.
expect(clickSpy.callCount).to.eql(1);
@@ -120,9 +120,9 @@ describe('Canvas', () => {
// Prosthetic does not fire a click when we down+up, but it real world
// browsers would, so let's simulate it.
UIEventSimulator.fireAt('click', 70, 60);
- expect(downSpy.called).to.be(true);
- expect(clickSpy.called).to.be(false);
- expect(preclickSpy.called).to.be(false);
+ expect(downSpy.called).to.be.true;
+ expect(clickSpy.called).to.be.false;
+ expect(preclickSpy.called).to.be.false;
done();
}
});
diff --git a/spec/suites/layer/vector/CircleMarkerSpec.js b/spec/suites/layer/vector/CircleMarkerSpec.js
index c3834b89f..4d0040e93 100644
--- a/spec/suites/layer/vector/CircleMarkerSpec.js
+++ b/spec/suites/layer/vector/CircleMarkerSpec.js
@@ -17,7 +17,7 @@
it('takes that radius', () => {
const marker = L.circleMarker([0, 0], {radius: 20}).addTo(map);
- expect(marker._radius).to.be(20);
+ expect(marker._radius).to.equal(20);
});
});
@@ -26,7 +26,7 @@
const marker = L.circleMarker([0, 0], {radius: 20});
marker.setRadius(15);
marker.addTo(map);
- expect(marker._radius).to.be(15);
+ expect(marker._radius).to.equal(15);
});
});
@@ -35,7 +35,7 @@
const marker = L.circleMarker([0, 0], {radius: 20});
marker.addTo(map);
marker.setRadius(15);
- expect(marker._radius).to.be(15);
+ expect(marker._radius).to.equal(15);
});
});
@@ -44,7 +44,7 @@
const marker = L.circleMarker([0, 0], {radius: 20});
marker.addTo(map);
marker.setStyle({radius: 15});
- expect(marker._radius).to.be(15);
+ expect(marker._radius).to.equal(15);
});
});
@@ -53,7 +53,7 @@
const marker = L.circleMarker([0, 0], {radius: 20});
marker.setStyle({radius: 15});
marker.addTo(map);
- expect(marker._radius).to.be(15);
+ expect(marker._radius).to.equal(15);
});
});
});
@@ -74,10 +74,10 @@
marker.setLatLng(afterLatLng);
- expect(eventArgs).to.not.be(null);
- expect(eventArgs.oldLatLng).to.be(beforeLatLng);
- expect(eventArgs.latlng).to.be(afterLatLng);
- expect(marker.getLatLng()).to.be(afterLatLng);
+ expect(eventArgs).to.not.equal(null);
+ expect(eventArgs.oldLatLng).to.equal(beforeLatLng);
+ expect(eventArgs.latlng).to.equal(afterLatLng);
+ expect(marker.getLatLng()).to.equal(afterLatLng);
});
});
@@ -89,8 +89,8 @@
circlemarker.addTo(map);
- expect(circlemarker._containsPoint(point1)).to.be(true);
- expect(circlemarker._containsPoint(point2)).to.be(false);
+ expect(circlemarker._containsPoint(point1)).to.be.true;
+ expect(circlemarker._containsPoint(point2)).to.be.false;
});
});
});
diff --git a/spec/suites/layer/vector/CircleSpec.js b/spec/suites/layer/vector/CircleSpec.js
index c7377233a..101701f47 100644
--- a/spec/suites/layer/vector/CircleSpec.js
+++ b/spec/suites/layer/vector/CircleSpec.js
@@ -21,7 +21,7 @@ describe('Circle', () => {
it('throws error if radius is NaN', () => {
expect(() => {
L.circle([0, 0], NaN);
- }).to.throwException('Circle radius cannot be NaN');
+ }).to.throw('Circle radius cannot be NaN');
});
});
diff --git a/spec/suites/layer/vector/PathSpec.js b/spec/suites/layer/vector/PathSpec.js
index 91d5f261d..4865569d1 100644
--- a/spec/suites/layer/vector/PathSpec.js
+++ b/spec/suites/layer/vector/PathSpec.js
@@ -51,7 +51,7 @@ describe('Path', () => {
const layer = L.polygon([[1, 2], [3, 4], [5, 6]]).addTo(map);
layer.on('click', spy);
UIEventSimulator.fire('click', layer._path);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
it('propagates click event by default', () => {
@@ -63,9 +63,9 @@ describe('Path', () => {
layer.on('click', spy2);
map.on('click', mapSpy);
UIEventSimulator.fire('click', layer._path);
- expect(spy.called).to.be.ok();
- expect(spy2.called).to.be.ok();
- expect(mapSpy.called).to.be.ok();
+ expect(spy.called).to.be.true;
+ expect(spy2.called).to.be.true;
+ expect(mapSpy.called).to.be.true;
});
it('can add a layer while being inside a moveend handler', () => {
@@ -83,10 +83,10 @@ describe('Path', () => {
map.setView([1, 2], 12, {animate: false});
map.panBy([-260, 0], {animate: false});
- expect(polygon._parts.length).to.be(0);
+ expect(polygon._parts.length).to.equal(0);
map.panBy([260, 0], {animate: false});
- expect(polygon._parts.length).to.be(1);
+ expect(polygon._parts.length).to.equal(1);
});
it('it should return tolerance with stroke', () => {
diff --git a/spec/suites/layer/vector/PolygonSpec.js b/spec/suites/layer/vector/PolygonSpec.js
index ff7f40bac..7c173104b 100644
--- a/spec/suites/layer/vector/PolygonSpec.js
+++ b/spec/suites/layer/vector/PolygonSpec.js
@@ -16,7 +16,7 @@ describe('Polygon', () => {
const polygon = L.polygon(latLngs);
- expect(L.LineUtil.isFlat(polygon._latlngs)).to.be(false);
+ expect(L.LineUtil.isFlat(polygon._latlngs)).to.be.false;
expect(polygon.getLatLngs()).to.eql(polygon._latlngs);
});
@@ -72,7 +72,7 @@ describe('Polygon', () => {
it('can be added to the map when empty', () => {
const polygon = L.polygon([]).addTo(map);
const isAdded = map.hasLayer(polygon);
- expect(isAdded).to.be(true);
+ expect(isAdded).to.be.true;
});
});
@@ -81,13 +81,13 @@ describe('Polygon', () => {
it('should return true for a polygon with no latlngs', () => {
const layer = L.polygon([]);
- expect(layer.isEmpty()).to.be(true);
+ expect(layer.isEmpty()).to.be.true;
});
it('should return false for simple polygon', () => {
const latLngs = [[1, 2], [3, 4], [5, 6]];
const layer = L.polygon(latLngs);
- expect(layer.isEmpty()).to.be(false);
+ expect(layer.isEmpty()).to.be.false;
});
it('should return false for a multi-polygon', () => {
@@ -96,7 +96,7 @@ describe('Polygon', () => {
[[[0, 10], [10, 10], [10, 0]], [[2, 3], [2, 4], [3, 4]]]
];
const layer = L.polygon(latLngs);
- expect(layer.isEmpty()).to.be(false);
+ expect(layer.isEmpty()).to.be.false;
});
});
@@ -173,7 +173,7 @@ describe('Polygon', () => {
];
const layer = L.polygon(latlngs);
layer.getCenter();
- }).to.throwException('Must add layer to map before using getCenter()');
+ }).to.throw('Must add layer to map before using getCenter()');
});
it('should compute same center for low and high zoom', () => {
@@ -356,7 +356,7 @@ describe('Polygon', () => {
polygon.setStyle(style);
for (const [prop, expectedValue] of Object.entries(style)) {
- expect(polygon.options[prop]).to.be(expectedValue);
+ expect(polygon.options[prop]).to.equal(expectedValue);
}
});
});
diff --git a/spec/suites/layer/vector/PolylineSpec.js b/spec/suites/layer/vector/PolylineSpec.js
index 62efa7582..ec006498c 100644
--- a/spec/suites/layer/vector/PolylineSpec.js
+++ b/spec/suites/layer/vector/PolylineSpec.js
@@ -47,7 +47,7 @@ describe('Polyline', () => {
it('can be added to the map when empty', () => {
const polyline = L.polyline([]).addTo(map);
- expect(map.hasLayer(polyline)).to.be(true);
+ expect(map.hasLayer(polyline)).to.be.true;
});
});
@@ -55,13 +55,13 @@ describe('Polyline', () => {
describe('#isEmpty', () => {
it('should return true for a polyline with no latlngs', () => {
const polyline = L.polyline([]);
- expect(polyline.isEmpty()).to.be(true);
+ expect(polyline.isEmpty()).to.be.true;
});
it('should return false for simple polyline', () => {
const latLngs = [[1, 2], [3, 4]];
const polyline = L.polyline(latLngs);
- expect(polyline.isEmpty()).to.be(false);
+ expect(polyline.isEmpty()).to.be.false;
});
it('should return false for multi-polyline', () => {
@@ -70,7 +70,7 @@ describe('Polyline', () => {
[[11, 12], [13, 14]]
];
const polyline = L.polyline(latLngs);
- expect(polyline.isEmpty()).to.be(false);
+ expect(polyline.isEmpty()).to.be.false;
});
});
@@ -146,7 +146,7 @@ describe('Polyline', () => {
expect(() => {
const polyline = L.polyline([[0, 0], [0, 0.090]]);
polyline.getCenter();
- }).to.throwException('Must add layer to map before using getCenter()');
+ }).to.throw('Must add layer to map before using getCenter()');
});
it('should compute same center for low and high zoom', () => {
@@ -248,7 +248,7 @@ describe('Polyline', () => {
polyline.setStyle(style);
for (const [prop, expectedValue] of Object.entries(style)) {
- expect(polyline.options[prop]).to.be(expectedValue);
+ expect(polyline.options[prop]).to.equal(expectedValue);
}
});
});
@@ -264,7 +264,7 @@ describe('Polyline', () => {
polyline.setStyle(style);
for (const [prop, expectedValue] of Object.entries(style)) {
- expect(polyline.options[prop]).to.be(expectedValue);
+ expect(polyline.options[prop]).to.equal(expectedValue);
}
});
});
@@ -280,13 +280,13 @@ describe('Polyline', () => {
});
map.addLayer(polyline);
- expect(polyline.closestLayerPoint(p1)).to.be(null);
+ expect(polyline.closestLayerPoint(p1)).to.equal(null);
polyline.setLatLngs(latlngs);
const point = polyline.closestLayerPoint(p1);
- expect(point).not.to.be(null);
- expect(point.distance).to.not.be(Infinity);
- expect(point.distance).to.not.be(NaN);
+ expect(point).not.to.equal(null);
+ expect(point.distance).to.not.equal(Infinity);
+ expect(point.distance).to.not.equal(NaN);
const point2 = polyline.closestLayerPoint(p2);
diff --git a/spec/suites/layer/vector/RectangleSpec.js b/spec/suites/layer/vector/RectangleSpec.js
index 85b519643..b99db887a 100644
--- a/spec/suites/layer/vector/RectangleSpec.js
+++ b/spec/suites/layer/vector/RectangleSpec.js
@@ -16,7 +16,7 @@ describe('Rectangle', () => {
const rectangle = L.rectangle(latLngs);
- expect(L.LineUtil.isFlat(rectangle._latlngs)).to.be(false);
+ expect(L.LineUtil.isFlat(rectangle._latlngs)).to.be.false;
expect(rectangle.getLatLngs()).to.eql(rectangle._latlngs);
});
@@ -37,7 +37,7 @@ describe('Rectangle', () => {
// Throws error due to undefined lat
expect(() => {
L.rectangle([]);
- }).to.throwException();
+ }).to.throw();
});
it('can be initialized with extending bounds', () => {
@@ -119,7 +119,7 @@ describe('Rectangle', () => {
map.setView([0, 0], 6);
expect(() => {
L.polygon([[[2, 3], [4, 5]]]).addTo(map).bindTooltip('test');
- }).to.not.throwException();
+ }).to.not.throw();
});
});
});
diff --git a/spec/suites/map/MapSpec.js b/spec/suites/map/MapSpec.js
index 84c85025c..cdd9448fa 100644
--- a/spec/suites/map/MapSpec.js
+++ b/spec/suites/map/MapSpec.js
@@ -23,33 +23,33 @@ describe('Map', () => {
map.on('unload', spy);
map.remove();
map = null;
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
it('fires no unload event if not loaded', () => {
map.on('unload', spy);
map.remove();
map = null;
- expect(spy.called).not.to.be.ok();
+ expect(spy.called).not.to.be.true;
});
describe('corner case checking', () => {
it('throws an exception upon reinitialization', () => {
- expect(L.map).withArgs(container)
- .to.throwException('Map container is already initialized.');
+ expect(() => L.map(container))
+ .to.throw('Map container is already initialized.');
});
it('throws an exception if a container is not found', () => {
- expect(L.map).withArgs('nonexistentdivelement')
- .to.throwException('Map container not found.');
+ expect(() => L.map('nonexistentdivelement'))
+ .to.throw('Map container not found.');
});
});
it('undefines container._leaflet_id', () => {
- expect(container._leaflet_id).to.be.ok();
+ expect(container._leaflet_id).to.be.ok;
map.remove();
map = null;
- expect(container._leaflet_id).to.be(undefined);
+ expect(container._leaflet_id).to.equal(undefined);
});
it('unbinds events', () => {
@@ -57,7 +57,7 @@ describe('Map', () => {
map.setView([0, 0], 0);
map.on('click', spy);
UIEventSimulator.fire('click', container);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
// actual test
spy = sinon.spy();
@@ -71,7 +71,7 @@ describe('Map', () => {
UIEventSimulator.fire('mouseup', container);
UIEventSimulator.fire('mousemove', container);
- expect(spy.called).to.not.be.ok();
+ expect(spy.called).to.be.false;
});
it('does not throw if removed during animation', () => {
@@ -92,7 +92,7 @@ describe('Map', () => {
expect(() => {
map.remove();
- }).to.throwException();
+ }).to.throw();
map2.remove(); // clean up
map = null;
@@ -103,7 +103,7 @@ describe('Map', () => {
it('throws if not set before', () => {
expect(() => {
map.getCenter();
- }).to.throwError();
+ }).to.throw();
});
it('returns a precise center when zoomed in after being set (#426)', () => {
@@ -133,10 +133,10 @@ describe('Map', () => {
it('calls the callback when the map is loaded', () => {
const spy = sinon.spy();
map.whenReady(spy);
- expect(spy.called).to.not.be.ok();
+ expect(spy.called).to.be.false;
map.setView([0, 0], 1);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
});
@@ -146,30 +146,30 @@ describe('Map', () => {
map.setView([0, 0], 1);
map.whenReady(spy);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
});
});
describe('#setView', () => {
it('sets the view of the map', () => {
- expect(map.setView([51.505, -0.09], 13)).to.be(map);
- expect(map.getZoom()).to.be(13);
+ expect(map.setView([51.505, -0.09], 13)).to.equal(map);
+ expect(map.getZoom()).to.equal(13);
expect(map.getCenter().distanceTo([51.505, -0.09])).to.be.lessThan(5);
});
it('can be passed without a zoom specified', () => {
map.setZoom(13);
- expect(map.setView([51.605, -0.11])).to.be(map);
- expect(map.getZoom()).to.be(13);
+ expect(map.setView([51.605, -0.11])).to.equal(map);
+ expect(map.getZoom()).to.equal(13);
expect(map.getCenter().distanceTo([51.605, -0.11])).to.be.lessThan(5);
});
it('limits initial zoom when no zoom specified', () => {
map.options.maxZoom = 20;
map.setZoom(100);
- expect(map.setView([51.605, -0.11])).to.be(map);
- expect(map.getZoom()).to.be(20);
+ expect(map.setView([51.605, -0.11])).to.equal(map);
+ expect(map.getZoom()).to.equal(20);
expect(map.getCenter().distanceTo([51.605, -0.11])).to.be.lessThan(5);
});
@@ -177,7 +177,7 @@ describe('Map', () => {
const map = L.map(document.createElement('div'), {zoom: 13});
const zoom = map.setView([51.605, -0.11]).getZoom();
map.remove(); // clean up
- expect(zoom).to.be(13);
+ expect(zoom).to.equal(13);
});
it('passes duration option to panBy', () => {
@@ -211,7 +211,7 @@ describe('Map', () => {
map.options.maxZoom = 10;
map.setZoom(15);
- expect(map.getZoom()).to.be(15);
+ expect(map.getZoom()).to.equal(15);
});
it('overwrites zoom passed as map option', () => {
@@ -220,7 +220,7 @@ describe('Map', () => {
const zoom = map2.getZoom();
map2.remove(); // clean up
- expect(zoom).to.be(15);
+ expect(zoom).to.equal(15);
});
});
@@ -233,7 +233,7 @@ describe('Map', () => {
map.options.maxZoom = 10;
map.setZoom(15);
- expect(map.getZoom()).to.be(10);
+ expect(map.getZoom()).to.equal(10);
});
it('does not overwrite zoom passed as map option', () => {
@@ -243,7 +243,7 @@ describe('Map', () => {
const zoom = map2.getZoom();
map2.remove(); // clean up
- expect(zoom).to.be(13);
+ expect(zoom).to.equal(13);
});
});
@@ -251,27 +251,27 @@ describe('Map', () => {
map.zoom = 10;
map.setZoom(15);
- expect(map.getZoom()).to.be(15);
+ expect(map.getZoom()).to.equal(15);
});
it('can be passed without a zoom specified and keep previous zoom', () => {
const prevZoom = map.getZoom();
map.setZoom();
- expect(map.getZoom()).to.be(prevZoom);
+ expect(map.getZoom()).to.equal(prevZoom);
});
it('can be passed with a zoom level of undefined and keep previous zoom', () => {
const prevZoom = map.getZoom();
map.setZoom(undefined);
- expect(map.getZoom()).to.be(prevZoom);
+ expect(map.getZoom()).to.equal(prevZoom);
});
it('can be passed with a zoom level of infinity', () => {
map.setZoom(Infinity);
- expect(map.getZoom()).to.be(Infinity);
+ expect(map.getZoom()).to.equal(Infinity);
});
});
@@ -280,7 +280,7 @@ describe('Map', () => {
map.setView([50, 50], 10);
map.stop = sinon.spy();
map.panTo([10, 10], 10);
- expect(map.stop.called).to.not.be.ok();
+ expect(map.stop.called).to.be.false;
});
it('stops the execution of the flyTo animation', () => {
@@ -288,7 +288,7 @@ describe('Map', () => {
map.stop = sinon.spy();
map.flyTo([51.505, -0.09]);
map.stop();
- expect(map.stop.calledOnce).to.be.ok();
+ expect(map.stop.calledOnce).to.be.true;
});
it('stops the execution of the panTo animation', () => {
@@ -296,7 +296,7 @@ describe('Map', () => {
map.stop = sinon.spy();
map.panTo([51.505, -0.09]);
map.stop();
- expect(map.stop.calledOnce).to.be.ok();
+ expect(map.stop.calledOnce).to.be.true;
});
});
@@ -309,51 +309,51 @@ describe('Map', () => {
const point = L.point(5, 5);
map.setZoomAround(point, 5);
- expect(map.getBounds().contains(map.options.crs.pointToLatLng(point, 5))).to.be(false);
+ expect(map.getBounds().contains(map.options.crs.pointToLatLng(point, 5))).to.be.false;
});
it('pass Point and change pixel in view at high zoom', () => {
const point = L.point(5, 5);
map.setZoomAround(point, 18);
- expect(map.getBounds().contains(map.options.crs.pointToLatLng(point, 18))).to.be(false);
+ expect(map.getBounds().contains(map.options.crs.pointToLatLng(point, 18))).to.be.false;
});
it('pass latLng and keep specified latLng in view', () => {
map.setZoomAround([5, 5], 5);
- expect(map.getBounds().contains([5, 5])).to.be(true);
+ expect(map.getBounds().contains([5, 5])).to.be.true;
});
it('pass latLng and keep specified latLng in view at high zoom fails', () => {
map.setZoomAround([5, 5], 12); // usually fails around 9 zoom level
- expect(map.getBounds().contains([5, 5])).to.be(false);
+ expect(map.getBounds().contains([5, 5])).to.be.false;
});
it('throws if map is not loaded', () => {
const unloadedMap = L.map(document.createElement('div'));
- expect(unloadedMap.setZoomAround).withArgs([5, 5], 4).to.throwException();
+ expect(() => unloadedMap.setZoomAround([5, 5], 4)).to.throw();
});
it('throws if zoom is empty', () => {
- expect(map.setZoomAround).withArgs([5, 5]).to.throwException();
+ expect(() => map.setZoomAround([5, 5])).to.throw();
});
it('throws if zoom is undefined', () => {
- expect(map.setZoomAround).withArgs([5, 5], undefined).to.throwException();
+ expect(() => map.setZoomAround([5, 5], undefined)).to.throw();
});
it('throws if latLng is undefined', () => {
- expect(map.setZoomAround).withArgs([undefined, undefined], 4).to.throwException();
+ expect(() => map.setZoomAround([undefined, undefined], 4)).to.throw();
});
it('does not throw if latLng is infinity', () => {
map.setView([5, 5]);
map.setZoomAround([Infinity, Infinity], 4);
- expect(map.getCenter()).to.be.ok();
+ expect(map.getCenter()).to.be.ok;
});
});
@@ -457,7 +457,7 @@ describe('Map', () => {
expect(pixelCenter.x).to.eql(pixelInit.x);
expect(pixelCenter.y).not.to.eql(pixelInit.y);
// the view is inside the bounds
- expect(bounds.contains(map.getBounds())).to.be(true);
+ expect(bounds.contains(map.getBounds())).to.be.true;
});
it('remove listeners when called without arguments', (done) => {
@@ -469,7 +469,7 @@ describe('Map', () => {
// set view outside
const center = L.latLng([0, 0]);
map.once('moveend', () => {
- expect(center.equals(map.getCenter())).to.be(true);
+ expect(center.equals(map.getCenter())).to.be.true;
done();
});
map.setView(center, 18, {animate: false});
@@ -481,7 +481,7 @@ describe('Map', () => {
const bounds = L.latLngBounds([51.5, -0.05], [51.55, 0.05]);
map.off = sinon.spy();
map.setMaxBounds(bounds, {animate: false});
- expect(map.off.called).not.to.be.ok();
+ expect(map.off.called).not.to.be.true;
});
it('avoid subpixel / floating point related wobble (#8532)', (done) => {
@@ -493,7 +493,7 @@ describe('Map', () => {
// Unfortunately this is one of those tests where we need to allow at least one animation tick
setTimeout(() => {
- expect(spy.called).to.be(false);
+ expect(spy.called).to.be.false;
done();
}, 300);
});
@@ -526,7 +526,7 @@ describe('Map', () => {
expect(map.getMinZoom()).to.eql(3);
expect(map.getMaxZoom()).to.eql(7);
- expect(spy.called).to.not.be.ok();
+ expect(spy.called).to.be.false;
});
});
@@ -547,7 +547,7 @@ describe('Map', () => {
expect(map.getZoom()).to.eql(4);
expect(map.getMinZoom()).to.eql(2);
expect(map.getMaxZoom()).to.eql(7);
- expect(spy.calledTwice).to.be.ok();
+ expect(spy.calledTwice).to.be.true;
const postSpy = sinon.spy();
map.on('zoomlevelschange', postSpy);
@@ -555,7 +555,7 @@ describe('Map', () => {
map.setMinZoom(2);
map.setMaxZoom(7);
- expect(postSpy.called).to.not.be.ok();
+ expect(postSpy.called).to.be.false;
});
it('fire \'zoomlevelschange\' but do not change zoom if max/min zoom is less/more current zoom', () => {
@@ -565,7 +565,7 @@ describe('Map', () => {
expect(map.getZoom()).to.eql(4);
expect(map.getMinZoom()).to.eql(2);
expect(map.getMaxZoom()).to.eql(7);
- expect(spy.calledTwice).to.be.ok();
+ expect(spy.calledTwice).to.be.true;
});
});
@@ -573,26 +573,26 @@ describe('Map', () => {
map.setMinZoom(undefined);
map.setMaxZoom();
- expect(map.options.minZoom).to.be(undefined);
- expect(map.options.maxZoom).to.be(undefined);
+ expect(map.options.minZoom).to.equal(undefined);
+ expect(map.options.maxZoom).to.equal(undefined);
- expect(map.getMinZoom()).to.be(0); // min layer zoom used instead
- expect(map.getMaxZoom()).to.be(Infinity); // max layer zoom used instead
+ expect(map.getMinZoom()).to.equal(0); // min layer zoom used instead
+ expect(map.getMaxZoom()).to.equal(Infinity); // max layer zoom used instead
});
it('allow infinity to be passed', () => {
map.setMinZoom(Infinity);
map.setMaxZoom(Infinity);
- expect(map.getMinZoom()).to.be(Infinity);
- expect(map.getMaxZoom()).to.be(Infinity);
+ expect(map.getMinZoom()).to.equal(Infinity);
+ expect(map.getMaxZoom()).to.equal(Infinity);
});
});
describe('#getMinZoom and #getMaxZoom', () => {
describe('#getMinZoom', () => {
it('returns 0 if not set by Map options or TileLayer options', () => {
- expect(map.getMinZoom()).to.be(0);
+ expect(map.getMinZoom()).to.equal(0);
});
});
@@ -605,8 +605,8 @@ describe('Map', () => {
L.tileLayer('', {minZoom: 6, maxZoom: 17}).addTo(map);
L.tileLayer('', {minZoom: 0, maxZoom: 22}).addTo(map);
- expect(map.getMinZoom()).to.be(2);
- expect(map.getMaxZoom()).to.be(20);
+ expect(map.getMinZoom()).to.equal(2);
+ expect(map.getMaxZoom()).to.equal(20);
});
it('layer minZoom overrides map zoom if map has no minZoom set and layer minZoom is bigger than map zoom', () => {
@@ -616,7 +616,7 @@ describe('Map', () => {
L.tileLayer('', {minZoom: 15}).addTo(map);
- expect(map.getMinZoom()).to.be(15);
+ expect(map.getMinZoom()).to.equal(15);
});
it('layer maxZoom overrides map zoom if map has no maxZoom set and layer maxZoom is smaller than map zoom', () => {
@@ -626,7 +626,7 @@ describe('Map', () => {
L.tileLayer('', {maxZoom: 15}).addTo(map);
- expect(map.getMaxZoom()).to.be(15);
+ expect(map.getMaxZoom()).to.equal(15);
});
it('map\'s zoom is adjusted to layer\'s minZoom even if initialized with smaller value', () => {
@@ -636,7 +636,7 @@ describe('Map', () => {
L.tileLayer('', {minZoom: 15}).addTo(map);
- expect(map.getZoom()).to.be(15);
+ expect(map.getZoom()).to.equal(15);
});
it('map\'s zoom is adjusted to layer\'s maxZoom even if initialized with larger value', () => {
@@ -646,7 +646,7 @@ describe('Map', () => {
L.tileLayer('', {maxZoom: 15}).addTo(map);
- expect(map.getZoom()).to.be(15);
+ expect(map.getZoom()).to.equal(15);
});
});
@@ -695,12 +695,12 @@ describe('Map', () => {
UIEventSimulator.fire('click', window);
UIEventSimulator.fire('click', window);
- expect(spy.called).not.to.be.ok();
+ expect(spy.called).not.to.be.true;
map.clickHandler.enable();
UIEventSimulator.fire('click', window);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
map.clickHandler.disable();
@@ -735,7 +735,7 @@ describe('Map', () => {
map.createPane('overlayPane');
- expect(map.getPane('overlayPane')).to.not.be(overlayPane);
+ expect(map.getPane('overlayPane')).to.not.equal(overlayPane);
});
});
@@ -773,7 +773,7 @@ describe('Map', () => {
describe('#getContainer', () => {
it('return container object', () => {
- expect(map.getContainer()._leaflet_id).to.be.ok();
+ expect(map.getContainer()._leaflet_id).to.be.ok;
});
it('return undefined on empty container id', () => {
@@ -812,7 +812,7 @@ describe('Map', () => {
});
it('return clone of size object from map', () => {
- expect(map.getSize()).to.not.be(map._size);
+ expect(map.getSize()).to.not.equal(map._size);
});
it('return previous size on empty map', () => {
@@ -850,7 +850,7 @@ describe('Map', () => {
const container2 = createContainer();
const map2 = L.map(container2);
- expect(map2.getPixelBounds).to.throwException();
+ expect(map2.getPixelBounds).to.throw();
map2.remove(); // clean up
});
@@ -881,7 +881,7 @@ describe('Map', () => {
const container2 = createContainer();
const map2 = L.map(container2);
- expect(map2.getPixelOrigin).to.throwException();
+ expect(map2.getPixelOrigin).to.throw();
map2.remove(); // clean up
});
@@ -924,12 +924,12 @@ describe('Map', () => {
describe('#hasLayer', () => {
it('throws when called without proper argument', () => {
const hasLayer = map.hasLayer.bind(map);
- expect(hasLayer).withArgs(new L.Layer()).to.not.throwException(); // control case
+ expect(() => hasLayer(new L.Layer())).to.not.throw(); // control case
- expect(hasLayer).withArgs(undefined).to.throwException();
- expect(hasLayer).withArgs(null).to.throwException();
- expect(hasLayer).withArgs(false).to.throwException();
- expect(hasLayer).to.throwException();
+ expect(() => hasLayer(undefined)).to.throw();
+ expect(() => hasLayer(null)).to.throw();
+ expect(() => hasLayer(false)).to.throw();
+ expect(() => hasLayer()).to.throw();
});
});
@@ -945,15 +945,15 @@ describe('Map', () => {
const layer = layerSpy();
map.setView([0, 0], 0);
map.addLayer(layer);
- expect(layer.onAdd.called).to.be.ok();
+ expect(layer.onAdd.called).to.be.true;
});
it('calls layer.onAdd when the map becomes ready', () => {
const layer = layerSpy();
map.addLayer(layer);
- expect(layer.onAdd.called).not.to.be.ok();
+ expect(layer.onAdd.called).not.to.be.true;
map.setView([0, 0], 0);
- expect(layer.onAdd.called).to.be.ok();
+ expect(layer.onAdd.called).to.be.true;
});
it('does not call layer.onAdd if the layer is removed before the map becomes ready', () => {
@@ -961,7 +961,7 @@ describe('Map', () => {
map.addLayer(layer);
map.removeLayer(layer);
map.setView([0, 0], 0);
- expect(layer.onAdd.called).not.to.be.ok();
+ expect(layer.onAdd.called).not.to.be.true;
});
it('fires a layeradd event immediately if the map is ready', () => {
@@ -970,7 +970,7 @@ describe('Map', () => {
map.on('layeradd', spy);
map.setView([0, 0], 0);
map.addLayer(layer);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
it('fires a layeradd event when the map becomes ready', () => {
@@ -978,9 +978,9 @@ describe('Map', () => {
spy = sinon.spy();
map.on('layeradd', spy);
map.addLayer(layer);
- expect(spy.called).not.to.be.ok();
+ expect(spy.called).not.to.be.true;
map.setView([0, 0], 0);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
it('does not fire a layeradd event if the layer is removed before the map becomes ready', () => {
@@ -990,13 +990,13 @@ describe('Map', () => {
map.addLayer(layer);
map.removeLayer(layer);
map.setView([0, 0], 0);
- expect(spy.called).not.to.be.ok();
+ expect(spy.called).not.to.be.true;
});
it('adds the layer before firing layeradd', (done) => {
const layer = layerSpy();
map.on('layeradd', () => {
- expect(map.hasLayer(layer)).to.be.ok();
+ expect(map.hasLayer(layer)).to.be.true;
done();
});
map.setView([0, 0], 0);
@@ -1007,16 +1007,16 @@ describe('Map', () => {
const control = L.control.layers();
expect(() => {
map.addLayer(control);
- }).to.throwError();
+ }).to.throw();
});
describe('When the first layer is added to a map', () => {
it('fires a zoomlevelschange event', () => {
const spy = sinon.spy();
map.on('zoomlevelschange', spy);
- expect(spy.called).not.to.be.ok();
+ expect(spy.called).not.to.be.true;
L.tileLayer('', {minZoom: 0, maxZoom: 10}).addTo(map);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
});
@@ -1025,9 +1025,9 @@ describe('Map', () => {
const spy = sinon.spy();
L.tileLayer('', {minZoom: 0, maxZoom: 10}).addTo(map);
map.on('zoomlevelschange', spy);
- expect(spy.called).not.to.be.ok();
+ expect(spy.called).not.to.be.true;
L.tileLayer('', {minZoom: 0, maxZoom: 15}).addTo(map);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
});
@@ -1036,11 +1036,11 @@ describe('Map', () => {
const spy = sinon.spy();
L.tileLayer('', {minZoom: 0, maxZoom: 10}).addTo(map);
map.on('zoomlevelschange', spy);
- expect(spy.called).not.to.be.ok();
+ expect(spy.called).not.to.be.true;
L.tileLayer('', {minZoom: 0, maxZoom: 10}).addTo(map);
- expect(spy.called).not.to.be.ok();
+ expect(spy.called).not.to.be.true;
L.tileLayer('', {minZoom: 0, maxZoom: 5}).addTo(map);
- expect(spy.called).not.to.be.ok();
+ expect(spy.called).not.to.be.true;
});
});
});
@@ -1051,21 +1051,21 @@ describe('Map', () => {
map.setView([0, 0], 0);
map.addLayer(layer);
map.removeLayer(layer);
- expect(layer.onRemove.called).to.be.ok();
+ expect(layer.onRemove.called).to.be.true;
});
it('does not call layer.onRemove if the layer was not added', () => {
const layer = layerSpy();
map.setView([0, 0], 0);
map.removeLayer(layer);
- expect(layer.onRemove.called).not.to.be.ok();
+ expect(layer.onRemove.called).not.to.be.true;
});
it('does not call layer.onRemove if the map is not ready', () => {
const layer = layerSpy();
map.addLayer(layer);
map.removeLayer(layer);
- expect(layer.onRemove.called).not.to.be.ok();
+ expect(layer.onRemove.called).not.to.be.true;
});
it('fires a layerremove event if the map is ready', () => {
@@ -1075,7 +1075,7 @@ describe('Map', () => {
map.setView([0, 0], 0);
map.addLayer(layer);
map.removeLayer(layer);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
it('does not fire a layerremove if the layer was not added', () => {
@@ -1084,7 +1084,7 @@ describe('Map', () => {
map.on('layerremove', spy);
map.setView([0, 0], 0);
map.removeLayer(layer);
- expect(spy.called).not.to.be.ok();
+ expect(spy.called).not.to.be.true;
});
it('does not fire a layerremove if the map is not ready', () => {
@@ -1093,13 +1093,13 @@ describe('Map', () => {
map.on('layerremove', spy);
map.addLayer(layer);
map.removeLayer(layer);
- expect(spy.called).not.to.be.ok();
+ expect(spy.called).not.to.be.true;
});
it('removes the layer before firing layerremove', (done) => {
const layer = layerSpy();
map.on('layerremove', () => {
- expect(map.hasLayer(layer)).not.to.be.ok();
+ expect(map.hasLayer(layer)).not.to.be.true;
done();
});
map.setView([0, 0], 0);
@@ -1127,9 +1127,9 @@ describe('Map', () => {
const tl = L.tileLayer('', {minZoom: 0, maxZoom: 10}).addTo(map);
map.on('zoomlevelschange', spy);
- expect(spy.called).not.to.be.ok();
+ expect(spy.called).not.to.be.true;
map.removeLayer(tl);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
});
@@ -1141,9 +1141,9 @@ describe('Map', () => {
t2 = L.tileLayer('', {minZoom: 0, maxZoom: 15}).addTo(map);
map.on('zoomlevelschange', spy);
- expect(spy.called).to.not.be.ok();
+ expect(spy.called).to.be.false;
map.removeLayer(t2);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
});
@@ -1157,18 +1157,18 @@ describe('Map', () => {
map.on('zoomlevelschange', spy);
map.removeLayer(t2);
- expect(spy.called).to.not.be.ok();
+ expect(spy.called).to.be.false;
map.removeLayer(t3);
- expect(spy.called).to.not.be.ok();
+ expect(spy.called).to.be.false;
map.removeLayer(t1);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
});
});
describe('#eachLayer', () => {
it('returns self', () => {
- expect(map.eachLayer(L.Util.falseFn)).to.be(map);
+ expect(map.eachLayer(L.Util.falseFn)).to.equal(map);
});
it('calls the provided function for each layer', () => {
@@ -1189,7 +1189,7 @@ describe('Map', () => {
map.eachLayer(spy, map);
- expect(spy.alwaysCalledOn(map)).to.be.ok();
+ expect(spy.alwaysCalledOn(map)).to.be.true;
});
});
@@ -1212,29 +1212,29 @@ describe('Map', () => {
it('pans by the right amount when growing in 1px increments', () => {
container.style.width = `${origWidth + 1}px`;
map.invalidateSize();
- expect(map._getMapPanePos().x).to.be(1);
+ expect(map._getMapPanePos().x).to.equal(1);
container.style.width = `${origWidth + 2}px`;
map.invalidateSize();
- expect(map._getMapPanePos().x).to.be(1);
+ expect(map._getMapPanePos().x).to.equal(1);
container.style.width = `${origWidth + 3}px`;
map.invalidateSize();
- expect(map._getMapPanePos().x).to.be(2);
+ expect(map._getMapPanePos().x).to.equal(2);
});
it('pans by the right amount when shrinking in 1px increments', () => {
container.style.width = `${origWidth - 1}px`;
map.invalidateSize();
- expect(map._getMapPanePos().x).to.be(0);
+ expect(map._getMapPanePos().x).to.equal(0);
container.style.width = `${origWidth - 2}px`;
map.invalidateSize();
- expect(map._getMapPanePos().x).to.be(-1);
+ expect(map._getMapPanePos().x).to.equal(-1);
container.style.width = `${origWidth - 3}px`;
map.invalidateSize();
- expect(map._getMapPanePos().x).to.be(-1);
+ expect(map._getMapPanePos().x).to.equal(-1);
});
it('pans back to the original position after growing by an odd size and back', () => {
@@ -1244,7 +1244,7 @@ describe('Map', () => {
container.style.width = `${origWidth}px`;
map.invalidateSize();
- expect(map._getMapPanePos().x).to.be(0);
+ expect(map._getMapPanePos().x).to.equal(0);
});
it('emits no move event if the size has not changed', () => {
@@ -1253,7 +1253,7 @@ describe('Map', () => {
map.invalidateSize();
- expect(spy.called).not.to.be.ok();
+ expect(spy.called).not.to.be.true;
});
it('emits a move event if the size has changed', () => {
@@ -1263,7 +1263,7 @@ describe('Map', () => {
container.style.width = `${origWidth + 5}px`;
map.invalidateSize();
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
it('emits a moveend event if the size has changed', () => {
@@ -1273,7 +1273,7 @@ describe('Map', () => {
container.style.width = `${origWidth + 5}px`;
map.invalidateSize();
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
it('debounces the moveend event if the debounceMoveend option is given', () => {
@@ -1283,11 +1283,11 @@ describe('Map', () => {
container.style.width = `${origWidth + 5}px`;
map.invalidateSize({debounceMoveend: true});
- expect(spy.called).not.to.be.ok();
+ expect(spy.called).not.to.be.true;
clock.tick(200);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
it('correctly adjusts for new container size when view is set during map initialization (#6165)', () => {
@@ -1324,12 +1324,12 @@ describe('Map', () => {
const spy = sinon.spy();
map.on('resize', spy);
- expect(spy.called).to.not.be.ok();
+ expect(spy.called).to.be.false;
map.getContainer().style.width = '200px';
map.on('resize', () => {
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
done();
});
});
@@ -1350,12 +1350,12 @@ describe('Map', () => {
const spy = sinon.spy();
map.invalidateSize = spy;
- expect(spy.called).to.not.be.ok();
+ expect(spy.called).to.be.false;
map.getContainer().style.width = '200px';
setTimeout(() => {
- expect(spy.called).to.not.be.ok();
+ expect(spy.called).to.be.false;
done();
// we need the 10 ms to be sure that the ResizeObserver is not triggered
}, 10);
@@ -1367,12 +1367,12 @@ describe('Map', () => {
const spy = sinon.spy();
map.invalidateSize = spy;
- expect(spy.called).to.not.be.ok();
+ expect(spy.called).to.be.false;
map.getContainer().style.width = '200px';
setTimeout(() => {
- expect(spy.called).to.not.be.ok();
+ expect(spy.called).to.be.false;
// make sure afterEach works correctly
map = L.map(container);
@@ -1544,7 +1544,7 @@ describe('Map', () => {
it('throws an error with invalid bounds', () => {
expect(() => {
map.fitBounds(NaN);
- }).to.throwError();
+ }).to.throw();
});
it('Fits to same scale and zoom', (done) => {
@@ -1602,16 +1602,16 @@ describe('Map', () => {
it('Snaps to a number after adding tile layer', () => {
map.addLayer(L.tileLayer(''));
- expect(map.getZoom()).to.be(undefined);
+ expect(map.getZoom()).to.equal(undefined);
map.fitBounds(bounds);
- expect(map.getZoom()).to.be(2);
+ expect(map.getZoom()).to.equal(2);
});
it('Snaps to a number after adding marker', () => {
map.addLayer(L.marker(center));
- expect(map.getZoom()).to.be(undefined);
+ expect(map.getZoom()).to.equal(undefined);
map.fitBounds(bounds);
- expect(map.getZoom()).to.be(2);
+ expect(map.getZoom()).to.equal(2);
});
});
@@ -1694,7 +1694,7 @@ describe('Map', () => {
it('pans on both X and Y axes when the target is outside of the view area and both the point\'s coords are outside the bounds', () => {
const p = map.unproject(tlPix.subtract([200, 200]));
map.panInside(p, {animate: false});
- expect(map.getBounds().contains(p)).to.be(true);
+ expect(map.getBounds().contains(p)).to.be.true;
expect(map.getCenter().lng).to.not.eql(center.lng);
expect(map.getCenter().lat).to.not.eql(center.lat);
});
@@ -1702,7 +1702,7 @@ describe('Map', () => {
it('pans only on the Y axis when the target\'s X coord is within bounds but the Y is not', () => {
const p = L.latLng(tl.lat + 5, tl.lng);
map.panInside(p, {animate: false});
- expect(map.getBounds().contains(p)).to.be(true);
+ expect(map.getBounds().contains(p)).to.be.true;
const dx = Math.abs(map.getCenter().lng - center.lng);
expect(dx).to.be.lessThan(1.0E-9);
expect(map.getCenter().lat).to.not.eql(center.lat);
@@ -1711,7 +1711,7 @@ describe('Map', () => {
it('pans only on the X axis when the target\'s Y coord is within bounds but the X is not', () => {
const p = L.latLng(tl.lat, tl.lng - 5);
map.panInside(p, 0, {animate: false});
- expect(map.getBounds().contains(p)).to.be(true);
+ expect(map.getBounds().contains(p)).to.be.true;
expect(map.getCenter().lng).to.not.eql(center.lng);
const dy = map.getCenter().lat - center.lat;
expect(dy).to.be.lessThan(1.0E-9);
@@ -1727,7 +1727,7 @@ describe('Map', () => {
map.panInside(map.unproject(target), {paddingBottomRight: [0, padding.y], animate: false});
const offset = map.project(map.getCenter()).subtract(oldCenter); // distance moved during the pan
const result = paddingOffset.add(targetOffset).subtract(offset);
- expect(result.trunc()).to.eql(L.point(0, 0));
+ expect(result.trunc().equals(L.point(0, 0))).to.be.true;
});
});
@@ -1741,7 +1741,7 @@ describe('Map', () => {
map.on('mousemove', spy);
const layer = L.polygon([[1, 2], [3, 4], [5, 6]]).addTo(map);
UIEventSimulator.fire('mousemove', layer._path);
- expect(spy.calledOnce).to.be.ok();
+ expect(spy.calledOnce).to.be.true;
});
it('DOM events propagate from marker to map', () => {
@@ -1749,7 +1749,7 @@ describe('Map', () => {
map.on('mousemove', spy);
const layer = L.marker([1, 2]).addTo(map);
UIEventSimulator.fire('mousemove', layer._icon);
- expect(spy.calledOnce).to.be.ok();
+ expect(spy.calledOnce).to.be.true;
});
it('DOM events fired on marker can be cancelled before being caught by the map', () => {
@@ -1759,8 +1759,8 @@ describe('Map', () => {
const layer = L.marker([1, 2]).addTo(map);
layer.on('mousemove', L.DomEvent.stopPropagation).on('mousemove', layerSpy);
UIEventSimulator.fire('mousemove', layer._icon);
- expect(layerSpy.calledOnce).to.be.ok();
- expect(mapSpy.called).not.to.be.ok();
+ expect(layerSpy.calledOnce).to.be.true;
+ expect(mapSpy.called).not.to.be.true;
});
it('DOM events fired on polygon can be cancelled before being caught by the map', () => {
@@ -1770,8 +1770,8 @@ describe('Map', () => {
const layer = L.polygon([[1, 2], [3, 4], [5, 6]]).addTo(map);
layer.on('mousemove', L.DomEvent.stopPropagation).on('mousemove', layerSpy);
UIEventSimulator.fire('mousemove', layer._path);
- expect(layerSpy.calledOnce).to.be.ok();
- expect(mapSpy.called).not.to.be.ok();
+ expect(layerSpy.calledOnce).to.be.true;
+ expect(mapSpy.called).not.to.be.true;
});
it('mouseout is forwarded if fired on the original target', () => {
@@ -1784,9 +1784,9 @@ describe('Map', () => {
layer.on('mouseout', layerSpy);
other.on('mouseout', otherSpy);
UIEventSimulator.fire('mouseout', layer._path, {relatedTarget: container});
- expect(mapSpy.called).not.to.be.ok();
- expect(otherSpy.called).not.to.be.ok();
- expect(layerSpy.calledOnce).to.be.ok();
+ expect(mapSpy.called).not.to.be.true;
+ expect(otherSpy.called).not.to.be.true;
+ expect(layerSpy.calledOnce).to.be.true;
});
it('mouseout is forwarded when using a DivIcon', () => {
@@ -1800,8 +1800,8 @@ describe('Map', () => {
map.on('mouseout', mapSpy);
layer.on('mouseout', layerSpy);
UIEventSimulator.fire('mouseout', layer._icon, {relatedTarget: container});
- expect(mapSpy.called).not.to.be.ok();
- expect(layerSpy.calledOnce).to.be.ok();
+ expect(mapSpy.called).not.to.be.true;
+ expect(layerSpy.calledOnce).to.be.true;
});
it('mouseout is not forwarded if relatedTarget is a target\'s child', () => {
@@ -1816,8 +1816,8 @@ describe('Map', () => {
map.on('mouseout', mapSpy);
layer.on('mouseout', layerSpy);
UIEventSimulator.fire('mouseout', layer._icon, {relatedTarget: child});
- expect(mapSpy.called).not.to.be.ok();
- expect(layerSpy.called).not.to.be.ok();
+ expect(mapSpy.called).not.to.be.true;
+ expect(layerSpy.called).not.to.be.true;
});
it('mouseout is not forwarded if fired on target\'s child', () => {
@@ -1832,8 +1832,8 @@ describe('Map', () => {
map.on('mouseout', mapSpy);
layer.on('mouseout', layerSpy);
UIEventSimulator.fire('mouseout', child, {relatedTarget: layer._icon});
- expect(mapSpy.called).not.to.be.ok();
- expect(layerSpy.called).not.to.be.ok();
+ expect(mapSpy.called).not.to.be.true;
+ expect(layerSpy.called).not.to.be.true;
});
it('mouseout is not forwarded to layers if fired on the map', () => {
@@ -1846,9 +1846,9 @@ describe('Map', () => {
layer.on('mouseout', layerSpy);
other.on('mouseout', otherSpy);
UIEventSimulator.fire('mouseout', container);
- expect(otherSpy.called).not.to.be.ok();
- expect(layerSpy.called).not.to.be.ok();
- expect(mapSpy.calledOnce).to.be.ok();
+ expect(otherSpy.called).not.to.be.true;
+ expect(layerSpy.called).not.to.be.true;
+ expect(mapSpy.calledOnce).to.be.true;
});
it('preclick is fired before click on marker and map', () => {
@@ -1856,19 +1856,19 @@ describe('Map', () => {
const layer = L.marker([1, 2], {bubblingMouseEvents: true}).addTo(map);
layer.on('preclick', (e) => {
expect(called++).to.eql(0);
- expect(e.latlng).to.ok();
+ expect(e.latlng).to.be.ok;
});
layer.on('click', (e) => {
expect(called++).to.eql(2);
- expect(e.latlng).to.ok();
+ expect(e.latlng).to.be.ok;
});
map.on('preclick', (e) => {
expect(called++).to.eql(1);
- expect(e.latlng).to.ok();
+ expect(e.latlng).to.be.ok;
});
map.on('click', (e) => {
expect(called++).to.eql(3);
- expect(e.latlng).to.ok();
+ expect(e.latlng).to.be.ok;
});
UIEventSimulator.fire('click', layer._icon);
expect(called).to.eql(4);
@@ -1896,9 +1896,9 @@ describe('Map', () => {
UIEventSimulator.fireAt('contextmenu', marker._point.x, marker._point.y); // second (#5995)
- expect(spy.callCount).to.be(2);
- expect(spy.firstCall.lastArg).to.be.ok();
- expect(spy.secondCall.lastArg).to.be.ok();
+ expect(spy.callCount).to.equal(2);
+ expect(spy.firstCall.lastArg).to.be.true;
+ expect(spy.secondCall.lastArg).to.be.true;
});
});
@@ -1922,12 +1922,12 @@ describe('Map', () => {
describe('#getZoom', () => {
it('returns undefined if map not initialized', () => {
- expect(map.getZoom()).to.be(undefined);
+ expect(map.getZoom()).to.equal(undefined);
});
it('returns undefined if map not initialized but layers added', () => {
map.addLayer(L.tileLayer(''));
- expect(map.getZoom()).to.be(undefined);
+ expect(map.getZoom()).to.equal(undefined);
});
});
@@ -1938,7 +1938,7 @@ describe('Map', () => {
map = null;
expect(() => {
fn({coords: {latitude: 40.415296, longitude: 10.7419264, accuracy: 1129.5646101470752}});
- }).to.not.throwException();
+ }).to.not.throw();
});
it('doesn\'t throw error if location is not found and map is not existing', () => {
map._locateOptions = {setView: true};
@@ -1947,7 +1947,7 @@ describe('Map', () => {
map = null;
expect(() => {
fn({coords: {latitude: 40.415296, longitude: 10.7419264, accuracy: 1129.5646101470752}});
- }).to.not.throwException();
+ }).to.not.throw();
});
});
@@ -1963,7 +1963,7 @@ describe('Map', () => {
});
expect(() => {
UIEventSimulator.fire('click', child);
- }).to.not.throwException();
+ }).to.not.throw();
});
});
@@ -1990,15 +1990,15 @@ describe('Map', () => {
});
it('throw with undefined values', () => {
- expect(map.distance).withArgs(undefined, undefined).to.throwException();
+ expect(() => map.distance(undefined, undefined)).to.throw();
});
it('throw with infinity values', () => {
- expect(map.distance).withArgs(Infinity, Infinity).to.throwException();
+ expect(() => map.distance(Infinity, Infinity)).to.throw();
});
it('throw with only 1 lat', () => {
- expect(map.distance).withArgs(20, 50).to.throwException();
+ expect(() => map.distance(20, 50)).to.throw();
});
it('return 0 with 2 same latLng', () => {
@@ -2045,36 +2045,36 @@ describe('Map', () => {
describe('_addZoomLimit', () => {
it('update zoom levels when min zoom is a number in a layer that is added to map', () => {
map._addZoomLimit(L.tileLayer('', {minZoom: 4}));
- expect(map._layersMinZoom).to.be(4);
+ expect(map._layersMinZoom).to.equal(4);
});
it('update zoom levels when max zoom is a number in a layer that is added to map', () => {
map._addZoomLimit(L.tileLayer('', {maxZoom: 10}));
- expect(map._layersMaxZoom).to.be(10);
+ expect(map._layersMaxZoom).to.equal(10);
});
it('update zoom levels when min zoom is a number in two layers that are added to map', () => {
map._addZoomLimit(L.tileLayer('', {minZoom: 6}));
map._addZoomLimit(L.tileLayer('', {minZoom: 4}));
- expect(map._layersMinZoom).to.be(4);
+ expect(map._layersMinZoom).to.equal(4);
});
it('update zoom levels when max zoom is a number in two layers that are added to map', () => {
map._addZoomLimit(L.tileLayer('', {maxZoom: 10}));
map._addZoomLimit(L.tileLayer('', {maxZoom: 8}));
- expect(map._layersMaxZoom).to.be(10);
+ expect(map._layersMaxZoom).to.equal(10);
});
// This test shows the NaN usage - it's not clear if NaN is a wanted "feature"
it('update zoom levels when min zoom is NaN in a layer that is added to map, so that min zoom becomes NaN,', () => {
map._addZoomLimit(L.tileLayer('', {minZoom: NaN}));
- expect(isNaN(map._layersMinZoom)).to.be(true);
+ expect(isNaN(map._layersMinZoom)).to.be.true;
});
// This test shows the NaN usage - it's not clear if NaN is a wanted "feature"
it('update zoom levels when max zoom is NaN in a layer that is added to map, so that max zoom becomes NaN', () => {
map._addZoomLimit(L.tileLayer('', {maxZoom: NaN}));
- expect(isNaN(map._layersMaxZoom)).to.be(true);
+ expect(isNaN(map._layersMaxZoom)).to.be.true;
});
// This test shows the NaN usage - it's not clear if NaN is a wanted "feature"
@@ -2084,7 +2084,7 @@ describe('Map', () => {
// map._addZoomLimit(L.tileLayer("", {minZoom: NaN})); --> Results in maxZoom = NaN --> _updateZoomLevels is not called.
// Not same logic as for maxZoom.
// map._addZoomLimit(L.tileLayer("", {minZoom: 4}));
- // expect(isNaN(map._layersMinZoom)).to.be(true);
+ // expect(isNaN(map._layersMinZoom)).to.be.true;
// });
// This test shows the NaN usage - it's not clear if NaN is a wanted "feature"
@@ -2092,12 +2092,12 @@ describe('Map', () => {
map._addZoomLimit(L.tileLayer('', {maxZoom: 10}));
map._addZoomLimit(L.tileLayer('', {maxZoom: 8}));
map._addZoomLimit(L.tileLayer('', {maxZoom: NaN}));
- expect(isNaN(map._layersMaxZoom)).to.be(true);
+ expect(isNaN(map._layersMaxZoom)).to.be.true;
});
it('doesn\'t update zoom levels when min and max zoom are both NaN in a layer that is added to map', () => {
map._addZoomLimit(L.tileLayer('', {minZoom: NaN, maxZoom: NaN}));
- expect(map._layersMinZoom === undefined && map._layersMaxZoom === undefined).to.be(true);
+ expect(map._layersMinZoom === undefined && map._layersMaxZoom === undefined).to.be.true;
});
});
@@ -2106,7 +2106,7 @@ describe('Map', () => {
it('throws if map is not set before', () => {
expect(() => {
map.containerPointToLatLng();
- }).to.throwError();
+ }).to.throw();
});
it('returns geographical coordinate for point relative to map container', () => {
@@ -2124,7 +2124,7 @@ describe('Map', () => {
it('throws if map is not set before', () => {
expect(() => {
map.latLngToContainerPoint();
- }).to.throwError();
+ }).to.throw();
});
it('returns point relative to map container for geographical coordinate', () => {
@@ -2141,12 +2141,12 @@ describe('Map', () => {
it('throws if map is not set before', () => {
expect(() => {
map.panTo();
- }).to.throwError();
+ }).to.throw();
});
it('pans the map to accurate location', () => {
const center = L.latLng([50, 30]);
- expect(map.panTo(center)).to.be(map);
+ expect(map.panTo(center)).to.equal(map);
expect(map.getCenter().distanceTo(center)).to.be.lessThan(5);
});
});
@@ -2156,20 +2156,20 @@ describe('Map', () => {
it('throws if map is not set before', () => {
expect(() => {
map.panInsideBounds();
- }).to.throwError();
+ }).to.throw();
});
it('throws if passed invalid bounds', () => {
expect(() => {
map.panInsideBounds(0, 0);
- }).to.throwError();
+ }).to.throw();
});
it('doesn\'t pan if already in bounds', () => {
map.setView([0, 0]);
const bounds = L.latLngBounds([[-1, -1], [1, 1]]);
const expectedCenter = L.latLng([0, 0]);
- expect(map.panInsideBounds(bounds)).to.be(map);
+ expect(map.panInsideBounds(bounds)).to.equal(map);
expect(map.getCenter()).to.be.nearLatLng(expectedCenter);
});
@@ -2177,7 +2177,7 @@ describe('Map', () => {
const bounds = L.latLngBounds([[41.8, -87.6], [40.7, -74]]);
const expectedCenter = L.latLng([41.59452223189, -74.2738647460]);
map.setView([50.5, 30.5], 10);
- expect(map.panInsideBounds(bounds)).to.be(map);
+ expect(map.panInsideBounds(bounds)).to.equal(map);
expect(map.getCenter()).to.be.nearLatLng(expectedCenter);
});
});
@@ -2187,7 +2187,7 @@ describe('Map', () => {
it('throws if map is not set before', () => {
expect(() => {
map.latLngToLayerPoint();
- }).to.throwError();
+ }).to.throw();
});
it('returns the corresponding pixel coordinate relative to the origin pixel', () => {
@@ -2204,7 +2204,7 @@ describe('Map', () => {
it('throws if map is not set before', () => {
expect(() => {
map.layerPointToLatLng();
- }).to.throwError();
+ }).to.throw();
});
it('returns the corresponding geographical coordinate for a pixel coordinate relative to the origin pixel', () => {
@@ -2275,7 +2275,7 @@ describe('Map', () => {
});
map.on('locationerror', (error) => {
- expect(error.code).to.be(0);
+ expect(error.code).to.equal(0);
expect(error.message).to.eql('Geolocation error: Geolocation not supported..');
errorSpy();
@@ -2285,8 +2285,8 @@ describe('Map', () => {
map.locate({setView: true});
- expect(errorSpy.called).to.be.ok();
- expect(foundSpy.called).to.not.be.ok();
+ expect(errorSpy.called).to.be.true;
+ expect(foundSpy.called).to.be.false;
});
it('sets map view to geolocation coords', () => {
@@ -2299,7 +2299,7 @@ describe('Map', () => {
map.on('locationfound', (data) => {
expect(data.latlng).to.be.nearLatLng(expectedLatLngs);
- expect(data.timestamp).to.be(1670000000000);
+ expect(data.timestamp).to.equal(1670000000000);
expectedBounds = data.bounds;
@@ -2310,11 +2310,11 @@ describe('Map', () => {
map.locate({setView: true});
- expect(errorSpy.called).to.not.be.ok();
- expect(foundSpy.called).to.be.ok();
+ expect(errorSpy.called).to.be.false;
+ expect(foundSpy.called).to.be.true;
- expect(getCurrentPosSpy.called).to.be.ok();
- expect(watchPosSpy.called).to.not.be.ok();
+ expect(getCurrentPosSpy.called).to.be.true;
+ expect(watchPosSpy.called).to.be.false;
expect(map.getCenter()).to.be.nearLatLng(expectedLatLngs);
@@ -2333,7 +2333,7 @@ describe('Map', () => {
map.on('locationfound', (data) => {
expect(data.latlng).to.be.nearLatLng(expectedLatLngs);
- expect(data.timestamp).to.be(1660000000000);
+ expect(data.timestamp).to.equal(1660000000000);
expectedBounds = data.bounds;
@@ -2344,11 +2344,11 @@ describe('Map', () => {
map.locate({setView: true, watch: true});
- expect(errorSpy.called).to.not.be.ok();
- expect(foundSpy.called).to.be.ok();
+ expect(errorSpy.called).to.be.false;
+ expect(foundSpy.called).to.be.true;
- expect(getCurrentPosSpy.called).to.not.be.ok();
- expect(watchPosSpy.called).to.be.ok();
+ expect(getCurrentPosSpy.called).to.be.false;
+ expect(watchPosSpy.called).to.be.true;
expect(map.getCenter()).to.be.nearLatLng(expectedLatLngs);
@@ -2366,7 +2366,7 @@ describe('Map', () => {
map.on('locationfound', (data) => {
expect(data.latlng).to.be.nearLatLng([50, 50]);
- expect(data.timestamp).to.be(1670000000000);
+ expect(data.timestamp).to.equal(1670000000000);
foundSpy();
});
@@ -2375,13 +2375,13 @@ describe('Map', () => {
map.locate();
- expect(errorSpy.called).to.not.be.ok();
- expect(foundSpy.called).to.be.ok();
+ expect(errorSpy.called).to.be.false;
+ expect(foundSpy.called).to.be.true;
- expect(getCurrentPosSpy.called).to.be.ok();
- expect(watchPosSpy.called).to.not.be.ok();
+ expect(getCurrentPosSpy.called).to.be.true;
+ expect(watchPosSpy.called).to.be.false;
- expect(map._loaded).to.not.be.ok();
+ expect(map._loaded).to.be.undefined;
});
});
@@ -2390,7 +2390,7 @@ describe('Map', () => {
it('throws if map is not set before', () => {
expect(() => {
map.mouseEventToLatLng({clientX: 10, clientY: 10});
- }).to.throwException();
+ }).to.throw();
});
it('returns geographical coordinate where the event took place.', () => {
@@ -2431,7 +2431,7 @@ describe('Map', () => {
it('throws if map is not set before', () => {
expect(() => {
map.mouseEventToContainerPoint();
- }).to.throwError();
+ }).to.throw();
});
it('returns the pixel coordinate relative to the map container where the event took place', () => {
@@ -2451,7 +2451,7 @@ describe('Map', () => {
it('throws if map is not set before', () => {
expect(() => {
map.panBy(offset);
- }).to.throwError();
+ }).to.throw();
});
it('pans the map by given offset', () => {
@@ -2460,7 +2460,7 @@ describe('Map', () => {
const offsetCenterPoint = map.options.crs.latLngToPoint(center, 7).add(offset);
const target = map.options.crs.pointToLatLng(offsetCenterPoint, 7);
- expect(map.panBy(offset, {animate: false})).to.be(map);
+ expect(map.panBy(offset, {animate: false})).to.equal(map);
expect(map.getCenter().distanceTo(target)).to.be.lessThan(5);
expect(map.getCenter()).to.be.nearLatLng([-10.9196177602, 10.9863281250]);
});
diff --git a/spec/suites/map/handler/Map.BoxZoom.js b/spec/suites/map/handler/Map.BoxZoom.js
index 735675f7a..a53fbac27 100644
--- a/spec/suites/map/handler/Map.BoxZoom.js
+++ b/spec/suites/map/handler/Map.BoxZoom.js
@@ -22,7 +22,7 @@ describe('Map.BoxZoom', () => {
// check if click event on the map is fired
UIEventSimulator.fire('click', map._container);
- expect(mapClick).to.be(true);
+ expect(mapClick).to.be.true;
let clientX = 100;
let clientY = 100;
@@ -52,7 +52,7 @@ describe('Map.BoxZoom', () => {
// check if click event on the map is fired
mapClick = false;
UIEventSimulator.fire('click', map._container);
- expect(mapClick).to.be(true);
+ expect(mapClick).to.be.true;
});
});
diff --git a/spec/suites/map/handler/Map.DragSpec.js b/spec/suites/map/handler/Map.DragSpec.js
index a5a2a5bf0..6646ed54c 100644
--- a/spec/suites/map/handler/Map.DragSpec.js
+++ b/spec/suites/map/handler/Map.DragSpec.js
@@ -16,9 +16,9 @@ describe('Map.Drag', () => {
dragging: true
});
- expect(map.dragging.enabled()).to.be(true);
+ expect(map.dragging.enabled()).to.be.true;
map.setView([0, 0], 0);
- expect(map.dragging.enabled()).to.be(true);
+ expect(map.dragging.enabled()).to.be.true;
});
it('calls the map with dragging and worldCopyJump enabled', () => {
@@ -27,9 +27,9 @@ describe('Map.Drag', () => {
worldCopyJump: true
});
- expect(map.dragging.enabled()).to.be(true);
+ expect(map.dragging.enabled()).to.be.true;
map.setView([0, 0], 0);
- expect(map.dragging.enabled()).to.be(true);
+ expect(map.dragging.enabled()).to.be.true;
});
it('calls the map with dragging disabled and worldCopyJump enabled; ' +
@@ -39,10 +39,10 @@ describe('Map.Drag', () => {
worldCopyJump: true
});
- expect(map.dragging.enabled()).to.be(false);
+ expect(map.dragging.enabled()).to.be.false;
map.setView([0, 0], 0);
map.dragging.enable();
- expect(map.dragging.enabled()).to.be(true);
+ expect(map.dragging.enabled()).to.be.true;
});
});
@@ -74,7 +74,7 @@ describe('Map.Drag', () => {
onStop() {
expect(map.getOffset()).to.eql(offset);
- expect(map.getZoom()).to.be(1);
+ expect(map.getZoom()).to.equal(1);
expect(map.getCenter()).to.be.nearLatLng([21.943045533, -180]);
done();
@@ -110,7 +110,7 @@ describe('Map.Drag', () => {
onStop() {
expect(map.getOffset()).to.eql(offset);
- expect(map.getZoom()).to.be(1);
+ expect(map.getZoom()).to.equal(1);
expect(map.getCenter()).to.be.nearLatLng([21.943045533, -180]);
done();
@@ -140,7 +140,7 @@ describe('Map.Drag', () => {
const hand = new Hand({
timing: 'fastframe',
onStop() {
- expect(map.getZoom()).to.be(1);
+ expect(map.getZoom()).to.equal(1);
// Expect center point to be the same as before the click
expect(map.getCenter()).to.eql(originalCenter);
expect(spy.callCount).to.eql(0); // No drag event should have been fired.
@@ -175,9 +175,9 @@ describe('Map.Drag', () => {
// A real user scenario would trigger a click on mouseup.
// We want to be sure we are cancelling it after a drag.
UIEventSimulator.fire('click', container);
- expect(dragSpy.called).to.be(true);
- expect(clickSpy.called).to.be(false);
- expect(preclickSpy.called).to.be(false);
+ expect(dragSpy.called).to.be.true;
+ expect(clickSpy.called).to.be.false;
+ expect(preclickSpy.called).to.be.false;
done();
}
});
@@ -212,10 +212,10 @@ describe('Map.Drag', () => {
// A real user scenario would trigger a click on mouseup.
// We want to be sure we are cancelling it after a drag.
UIEventSimulator.fire('click', container);
- expect(mapDragSpy.called).to.be(true);
- expect(markerDragSpy.called).to.be(false);
- expect(clickSpy.called).to.be(false);
- expect(preclickSpy.called).to.be(false);
+ expect(mapDragSpy.called).to.be.true;
+ expect(markerDragSpy.called).to.be.false;
+ expect(clickSpy.called).to.be.false;
+ expect(preclickSpy.called).to.be.false;
done();
}
});
@@ -252,10 +252,10 @@ describe('Map.Drag', () => {
// A real user scenario would trigger a click on mouseup.
// We want to be sure we are cancelling it after a drag.
UIEventSimulator.fire('click', marker._icon);
- expect(markerDragSpy.called).to.be(true);
- expect(mapDragSpy.called).to.be(false);
- expect(clickSpy.called).to.be(false);
- expect(preclickSpy.called).to.be(false);
+ expect(markerDragSpy.called).to.be.true;
+ expect(mapDragSpy.called).to.be.false;
+ expect(clickSpy.called).to.be.false;
+ expect(preclickSpy.called).to.be.false;
done();
}
});
@@ -284,7 +284,7 @@ describe('Map.Drag', () => {
const hand = new Hand({
timing: 'fastframe',
onStop() {
- expect(map.getZoom()).to.be(1);
+ expect(map.getZoom()).to.equal(1);
// Expect center point to be the same as before the click
expect(map.getCenter()).to.eql(originalCenter);
expect(spy.callCount).to.eql(0); // No drag event should have been fired.
@@ -318,7 +318,7 @@ describe('Map.Drag', () => {
onStop() {
expect(map.getOffset()).to.eql(offset);
- expect(map.getZoom()).to.be(1);
+ expect(map.getZoom()).to.equal(1);
expect(map.getCenter()).to.be.nearLatLng([21.943045533, -180]);
done();
@@ -345,9 +345,9 @@ describe('Map.Drag', () => {
const hand = new Hand({
timing: 'fastframe',
onStop() {
- expect(map.getZoom()).to.be(1);
+ expect(map.getZoom()).to.equal(1);
// Expect center point to be the same as before the click
- expect(map.getCenter().equals(originalCenter)).to.be.ok(); // small margin of error allowed
+ expect(map.getCenter().equals(originalCenter)).to.be.true; // small margin of error allowed
expect(spy.callCount).to.eql(0); // No drag event should have been fired.
done();
diff --git a/spec/suites/map/handler/Map.KeyboardSpec.js b/spec/suites/map/handler/Map.KeyboardSpec.js
index 61e48e56a..1b89c7851 100644
--- a/spec/suites/map/handler/Map.KeyboardSpec.js
+++ b/spec/suites/map/handler/Map.KeyboardSpec.js
@@ -125,12 +125,12 @@ describe('Map.Keyboard', () => {
const popup = L.popup().setLatLng([0, 0]).setContent('Null Island');
map.openPopup(popup);
- expect(popup.isOpen()).to.be(true);
+ expect(popup.isOpen()).to.be.true;
UIEventSimulator.fire('keydown', document, {code: KEYCODE_ESC});
UIEventSimulator.fire('keyup', document, {code: KEYCODE_ESC});
- expect(popup.isOpen()).to.be(false);
+ expect(popup.isOpen()).to.be.false;
});
});
@@ -140,12 +140,12 @@ describe('Map.Keyboard', () => {
const popup = L.popup({closeOnEscapeKey: false}).setLatLng([0, 0]).setContent('Null Island');
map.openPopup(popup);
- expect(popup.isOpen()).to.be(true);
+ expect(popup.isOpen()).to.be.true;
UIEventSimulator.fire('keydown', document, {code: KEYCODE_ESC});
UIEventSimulator.fire('keyup', document, {code: KEYCODE_ESC});
- expect(popup.isOpen()).to.be(true);
+ expect(popup.isOpen()).to.be.true;
});
});
@@ -159,9 +159,9 @@ describe('Map.Keyboard', () => {
UIEventSimulator.fire('keypress', container, {code: KEYCODE_LOWERCASE_A});
setTimeout(() => {
- expect(keyDownSpy.called).to.be(false);
- expect(keyPressSpy.called).to.be.ok();
- expect(keyUpSpy.called).to.be(false);
+ expect(keyDownSpy.called).to.be.false;
+ expect(keyPressSpy.called).to.be.true;
+ expect(keyUpSpy.called).to.be.false;
done();
}, 50);
});
@@ -175,9 +175,9 @@ describe('Map.Keyboard', () => {
UIEventSimulator.fire('keydown', container, {code: KEYCODE_LOWERCASE_A});
setTimeout(() => {
- expect(keyDownSpy.called).to.be.ok();
- expect(keyPressSpy.called).to.be(false);
- expect(keyUpSpy.called).to.be(false);
+ expect(keyDownSpy.called).to.be.true;
+ expect(keyPressSpy.called).to.be.false;
+ expect(keyUpSpy.called).to.be.false;
done();
}, 50);
});
@@ -191,9 +191,9 @@ describe('Map.Keyboard', () => {
UIEventSimulator.fire('keyup', container, {code: KEYCODE_LOWERCASE_A});
setTimeout(() => {
- expect(keyDownSpy.called).to.be(false);
- expect(keyPressSpy.called).to.be(false);
- expect(keyUpSpy.called).to.be.ok();
+ expect(keyDownSpy.called).to.be.false;
+ expect(keyPressSpy.called).to.be.false;
+ expect(keyUpSpy.called).to.be.true;
done();
}, 50);
});
diff --git a/spec/suites/map/handler/Map.ScrollWheelZoomSpec.js b/spec/suites/map/handler/Map.ScrollWheelZoomSpec.js
index c19fdc699..5198c35a9 100644
--- a/spec/suites/map/handler/Map.ScrollWheelZoomSpec.js
+++ b/spec/suites/map/handler/Map.ScrollWheelZoomSpec.js
@@ -74,11 +74,11 @@ describe('Map.ScrollWheelZoom', () => {
setTimeout(() => {
UIEventSimulator.fire(wheel, container, scrollIn);
- expect(spy.notCalled).to.be.ok();
+ expect(spy.notCalled).to.be.true;
}, 50);
map.on('zoomend', () => {
- expect(spy.calledOnce).to.be.ok();
+ expect(spy.calledOnce).to.be.true;
// Bug 1.8.0: Firefox wheel zoom makes 2 steps #7403
// expect(map.getCenter()).to.be.nearLatLng([25.48295117535531, -26.367187500000004]);
expect(map.getZoom()).to.be.greaterThan(zoom);
@@ -99,7 +99,7 @@ describe('Map.ScrollWheelZoom', () => {
const zoomDiff = map.getZoom() - zoom;
map.setZoom(zoom, {animate: false});
- expect(map.getZoom()).to.be(zoom);
+ expect(map.getZoom()).to.equal(zoom);
map.options.wheelPxPerZoomLevel = 30 / L.DomEvent.getWheelPxFactor();
UIEventSimulator.fire(wheel, container, scrollIn);
diff --git a/spec/suites/map/handler/Map.TapHoldSpec.js b/spec/suites/map/handler/Map.TapHoldSpec.js
index 7fb80ca99..08b5b9454 100644
--- a/spec/suites/map/handler/Map.TapHoldSpec.js
+++ b/spec/suites/map/handler/Map.TapHoldSpec.js
@@ -38,16 +38,16 @@ describe('Map.TapHoldSpec.js', () => {
UIEventSimulator.fire('pointerdown', container, {pointerId:0, ...posStart});
clock.tick(550);
- expect(spy.notCalled).to.be.ok();
+ expect(spy.notCalled).to.be.true;
clock.tick(100);
- expect(spy.called).to.be.ok();
- expect(spy.calledOnce).to.be.ok();
+ expect(spy.called).to.be.true;
+ expect(spy.calledOnce).to.be.true;
const event = spy.lastCall.args[0];
- expect(event.type).to.be('contextmenu');
- expect(event.originalEvent._simulated).to.be.ok();
+ expect(event.type).to.equal('contextmenu');
+ expect(event.originalEvent._simulated).to.be.true;
});
it('does not fire contextmenu when touches > 1', () => {
@@ -59,7 +59,7 @@ describe('Map.TapHoldSpec.js', () => {
UIEventSimulator.fire('pointerdown', container, {pointerId:1, ...posNear});
clock.tick(550);
- expect(spy.notCalled).to.be.ok();
+ expect(spy.notCalled).to.be.true;
});
it('does not fire contextmenu when touches > 1 (case:2)', () => {
@@ -74,14 +74,14 @@ describe('Map.TapHoldSpec.js', () => {
UIEventSimulator.fire('pointerup', container, {pointerId:0, ...posNear});
clock.tick(450);
- expect(spy.notCalled).to.be.ok();
+ expect(spy.notCalled).to.be.true;
});
(L.Browser.pointer ? it : it.skip)('ignores events from mouse', () => {
UIEventSimulator.fire('pointerdown', container, {pointerId:0, pointerType:'mouse', ...posStart});
clock.tick(650);
- expect(spy.notCalled).to.be.ok();
+ expect(spy.notCalled).to.be.true;
});
it('does not conflict with native contextmenu', () => {
@@ -94,9 +94,9 @@ describe('Map.TapHoldSpec.js', () => {
clock.tick(100);
- expect(spy.called).to.be.ok();
- expect(spy.calledOnce).to.be.ok();
- expect(spy.lastCall.args[0].originalEvent._simulated).not.to.be.ok();
+ expect(spy.called).to.be.true;
+ expect(spy.calledOnce).to.be.true;
+ expect(spy.lastCall.args[0].originalEvent._simulated).not.to.be.true;
// Note: depending on tapHoldDelay value it's also possible that native contextmenu may come after simulated one
// and the only way to handle this gracefully - increase tapHoldDelay value.
@@ -115,7 +115,7 @@ describe('Map.TapHoldSpec.js', () => {
UIEventSimulator.fire('touchend', container, {touches: [posStart]});
UIEventSimulator.fire('pointerup', container, {pointerId:0, ...posNear});
- expect(clickSpy.notCalled).to.be.ok();
+ expect(clickSpy.notCalled).to.be.true;
});
it('allows short movements', () => {
@@ -128,7 +128,7 @@ describe('Map.TapHoldSpec.js', () => {
clock.tick(100);
- expect(spy.called).to.be.ok();
+ expect(spy.called).to.be.true;
});
it('ignores long movements', () => {
@@ -144,7 +144,7 @@ describe('Map.TapHoldSpec.js', () => {
clock.tick(100);
- expect(spy.notCalled).to.be.ok();
+ expect(spy.notCalled).to.be.true;
});
it('.originalEvent has expected properties', () => {
@@ -165,7 +165,7 @@ describe('Map.TapHoldSpec.js', () => {
target: container
}, posStart);
for (const [prop, expectedValue] of Object.entries(expectedProps)) {
- expect(originalEvent[prop]).to.be(expectedValue);
+ expect(originalEvent[prop]).to.equal(expectedValue);
}
});
});
diff --git a/spec/suites/map/handler/Map.TouchZoomSpec.js b/spec/suites/map/handler/Map.TouchZoomSpec.js
index d98a062c2..7c7e7aae7 100644
--- a/spec/suites/map/handler/Map.TouchZoomSpec.js
+++ b/spec/suites/map/handler/Map.TouchZoomSpec.js
@@ -18,9 +18,9 @@ describe('Map.TouchZoom', () => {
it.skipIfNotTouch('Increases zoom when pinching out', (done) => {
map.setView([0, 0], 1);
map.once('zoomend', () => {
- expect(map.getCenter()).to.eql({lat:0, lng:0});
+ expect(map.getCenter().equals(L.latLng({lat:0, lng:0}))).to.be.true;
// Initial zoom 1, initial distance 50px, final distance 450px
- expect(map.getZoom()).to.be(4);
+ expect(map.getZoom()).to.equal(4);
done();
});
@@ -39,9 +39,9 @@ describe('Map.TouchZoom', () => {
it.skipIfNotTouch('Decreases zoom when pinching in', (done) => {
map.setView([0, 0], 4);
map.once('zoomend', () => {
- expect(map.getCenter()).to.eql({lat:0, lng:0});
+ expect(map.getCenter().equals(L.latLng({lat:0, lng:0}))).to.be.true;
// Initial zoom 4, initial distance 450px, final distance 50px
- expect(map.getZoom()).to.be(1);
+ expect(map.getZoom()).to.equal(1);
done();
});
@@ -68,12 +68,12 @@ describe('Map.TouchZoom', () => {
pinchZoomEvent = e.pinch || pinchZoomEvent;
});
map.once('zoomend', () => {
- expect(spy.callCount > 1).to.be.ok();
- expect(pinchZoomEvent).to.be.ok();
+ expect(spy.callCount > 1).to.be.true;
+ expect(pinchZoomEvent).to.be.true;
- expect(map.getCenter()).to.eql({lat:0, lng:0});
+ expect(map.getCenter().equals(L.latLng({lat:0, lng:0}))).to.be.true;
// Initial zoom 4, initial distance 450px, final distance 50px
- expect(map.getZoom()).to.be(1);
+ expect(map.getZoom()).to.equal(1);
done();
});
@@ -104,8 +104,8 @@ describe('Map.TouchZoom', () => {
const hand = new Hand({
timing: 'fastframe',
onStop() {
- expect(map.getCenter().lat).to.be(0);
- expect(map.getCenter().lng > 5).to.be(true);
+ expect(map.getCenter().lat).to.equal(0);
+ expect(map.getCenter().lng > 5).to.be.true;
done();
}
});
@@ -139,9 +139,9 @@ describe('Map.TouchZoom', () => {
map.setView([0, 0], 4);
map.once('zoomend', () => {
- expect(map.getCenter()).to.eql({lat:0, lng:0});
+ expect(map.getCenter().equals(L.latLng({lat:0, lng:0}))).to.be.true;
// Initial zoom 4, initial distance 450px, final distance 50px
- expect(map.getZoom()).to.be(1);
+ expect(map.getZoom()).to.equal(1);
done();
});
@@ -190,9 +190,9 @@ describe('Map.TouchZoom', () => {
const width = renderedRect.width;
const height = renderedRect.height;
- expect(height < 50).to.be(true);
- expect(width < 50).to.be(true);
- expect(height + width > 0).to.be(true);
+ expect(height < 50).to.be.true;
+ expect(width < 50).to.be.true;
+ expect(height + width > 0).to.be.true;
const x = renderedRect.x;
const y = renderedRect.y;
@@ -252,9 +252,9 @@ describe('Map.TouchZoom', () => {
const width = renderedRect.width;
const height = renderedRect.height;
- expect(height < 50).to.be(true);
- expect(width < 50).to.be(true);
- expect(height + width > 0).to.be(true);
+ expect(height < 50).to.be.true;
+ expect(width < 50).to.be.true;
+ expect(height + width > 0).to.be.true;
const x = renderedRect.x;
const y = renderedRect.y;
diff --git a/src/map/Map.js b/src/map/Map.js
index c2cca7eaa..21fccb00e 100644
--- a/src/map/Map.js
+++ b/src/map/Map.js
@@ -792,7 +792,7 @@ export const Map = Evented.extend({
}
this._layers = [];
- this._panes = [];
+ this._panes = {};
delete this._mapPane;
delete this._renderer;