ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use deprecated sinon.stub(obj, 'meth', fn)

Browse Source 
Code updated using https://github.com/hurrymaplelad/sinon-codemod
This commit is contained in:
Frederic Junod
2017-03-08 15:37:45 +01:00
parent cc13ca68fa
commit 3e95c424ab
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/renderer/vector.test.js
+7 -13
View File
@@ -37,7 +37,7 @@ describe('ol.renderer.vector', function() {
squaredTolerance = 1; squaredTolerance = 1;
listener = function() {}; listener = function() {};
listenerThis = {}; listenerThis = {};
iconStyleLoadSpy = sinon.stub(iconStyle, 'load', function() { iconStyleLoadSpy = sinon.stub(iconStyle, 'load').callsFake(function() {
iconStyle.iconImage_.imageState_ = 1; // LOADING iconStyle.iconImage_.imageState_ = 1; // LOADING
}); });
}); });
@@ -79,8 +79,7 @@ describe('ol.renderer.vector', function() {
var imageReplay = replayGroup.getReplay( var imageReplay = replayGroup.getReplay(
style.getZIndex(), 'Image'); style.getZIndex(), 'Image');
var setImageStyleSpy = sinon.spy(imageReplay, 'setImageStyle'); var setImageStyleSpy = sinon.spy(imageReplay, 'setImageStyle');
var drawPointSpy = sinon.stub(imageReplay, var drawPointSpy = sinon.stub(imageReplay, 'drawPoint').callsFake(ol.nullFunction);
'drawPoint', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature, ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis); style, squaredTolerance, listener, listenerThis);
expect(setImageStyleSpy.called).to.be(false); expect(setImageStyleSpy.called).to.be(false);
@@ -93,8 +92,7 @@ describe('ol.renderer.vector', function() {
var imageReplay = replayGroup.getReplay( var imageReplay = replayGroup.getReplay(
style.getZIndex(), 'Image'); style.getZIndex(), 'Image');
var setImageStyleSpy = sinon.spy(imageReplay, 'setImageStyle'); var setImageStyleSpy = sinon.spy(imageReplay, 'setImageStyle');
var drawMultiPointSpy = sinon.stub(imageReplay, var drawMultiPointSpy = sinon.stub(imageReplay, 'drawMultiPoint').callsFake(ol.nullFunction);
'drawMultiPoint', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature, ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis); style, squaredTolerance, listener, listenerThis);
expect(setImageStyleSpy.called).to.be(false); expect(setImageStyleSpy.called).to.be(false);
@@ -108,8 +106,7 @@ describe('ol.renderer.vector', function() {
style.getZIndex(), 'LineString'); style.getZIndex(), 'LineString');
var setFillStrokeStyleSpy = sinon.spy(lineStringReplay, var setFillStrokeStyleSpy = sinon.spy(lineStringReplay,
'setFillStrokeStyle'); 'setFillStrokeStyle');
var drawLineStringSpy = sinon.stub(lineStringReplay, var drawLineStringSpy = sinon.stub(lineStringReplay, 'drawLineString').callsFake(ol.nullFunction);
'drawLineString', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature, ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis); style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true); expect(setFillStrokeStyleSpy.called).to.be(true);
@@ -124,8 +121,7 @@ describe('ol.renderer.vector', function() {
style.getZIndex(), 'LineString'); style.getZIndex(), 'LineString');
var setFillStrokeStyleSpy = sinon.spy(lineStringReplay, var setFillStrokeStyleSpy = sinon.spy(lineStringReplay,
'setFillStrokeStyle'); 'setFillStrokeStyle');
var drawMultiLineStringSpy = sinon.stub(lineStringReplay, var drawMultiLineStringSpy = sinon.stub(lineStringReplay, 'drawMultiLineString').callsFake(ol.nullFunction);
'drawMultiLineString', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature, ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis); style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true); expect(setFillStrokeStyleSpy.called).to.be(true);
@@ -141,8 +137,7 @@ describe('ol.renderer.vector', function() {
style.getZIndex(), 'Polygon'); style.getZIndex(), 'Polygon');
var setFillStrokeStyleSpy = sinon.spy(polygonReplay, var setFillStrokeStyleSpy = sinon.spy(polygonReplay,
'setFillStrokeStyle'); 'setFillStrokeStyle');
var drawPolygonSpy = sinon.stub(polygonReplay, var drawPolygonSpy = sinon.stub(polygonReplay, 'drawPolygon').callsFake(ol.nullFunction);
'drawPolygon', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature, ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis); style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true); expect(setFillStrokeStyleSpy.called).to.be(true);
@@ -158,8 +153,7 @@ describe('ol.renderer.vector', function() {
style.getZIndex(), 'Polygon'); style.getZIndex(), 'Polygon');
var setFillStrokeStyleSpy = sinon.spy(polygonReplay, var setFillStrokeStyleSpy = sinon.spy(polygonReplay,
'setFillStrokeStyle'); 'setFillStrokeStyle');
var drawMultiPolygonSpy = sinon.stub(polygonReplay, var drawMultiPolygonSpy = sinon.stub(polygonReplay, 'drawMultiPolygon').callsFake(ol.nullFunction);
'drawMultiPolygon', ol.nullFunction);
ol.renderer.vector.renderFeature(replayGroup, feature, ol.renderer.vector.renderFeature(replayGroup, feature,
style, squaredTolerance, listener, listenerThis); style, squaredTolerance, listener, listenerThis);
expect(setFillStrokeStyleSpy.called).to.be(true); expect(setFillStrokeStyleSpy.called).to.be(true);
test/spec/ol/tileurlfunction.test.js
+3 -3
View File
@@ -93,19 +93,19 @@ describe('ol.TileUrlFunction', function() {
var tileCoord = [3, 2, -2]; var tileCoord = [3, 2, -2];
/* eslint-disable openlayers-internal/no-missing-requires */ /* eslint-disable openlayers-internal/no-missing-requires */
sinon.stub(ol.tilecoord, 'hash', function() { sinon.stub(ol.tilecoord, 'hash').callsFake(function() {
return 3; return 3;
}); });
expect(tileUrlFunction(tileCoord)).to.eql('http://tile-1/3/2/1'); expect(tileUrlFunction(tileCoord)).to.eql('http://tile-1/3/2/1');
ol.tilecoord.hash.restore(); ol.tilecoord.hash.restore();
sinon.stub(ol.tilecoord, 'hash', function() { sinon.stub(ol.tilecoord, 'hash').callsFake(function() {
return 2; return 2;
}); });
expect(tileUrlFunction(tileCoord)).to.eql('http://tile-3/3/2/1'); expect(tileUrlFunction(tileCoord)).to.eql('http://tile-3/3/2/1');
ol.tilecoord.hash.restore(); ol.tilecoord.hash.restore();
sinon.stub(ol.tilecoord, 'hash', function() { sinon.stub(ol.tilecoord, 'hash').callsFake(function() {
return 1; return 1;
}); });
expect(tileUrlFunction(tileCoord)).to.eql('http://tile-2/3/2/1'); expect(tileUrlFunction(tileCoord)).to.eql('http://tile-2/3/2/1');