diff --git a/addon/components/layers/odata-vector-layer.js b/addon/components/layers/odata-vector-layer.js index 696fd3e75..31ae951ec 100644 --- a/addon/components/layers/odata-vector-layer.js +++ b/addon/components/layers/odata-vector-layer.js @@ -236,6 +236,11 @@ export default BaseVectorLayer.extend({ leafletObject = this.get('_leafletObject'); } + if (!layer) { + // явная ошибка, не должно быть такой ситуации + return leafletObject; + } + if (layer.state && layer.state !== state.insert) { L.FeatureGroup.prototype.addLayer.call(leafletObject, layer); return; diff --git a/testem.js b/testem.js index 7da1a9bfc..6bb8917a1 100644 --- a/testem.js +++ b/testem.js @@ -10,12 +10,15 @@ module.exports = { "Chrome" ], "browser_args": { - "Chrome": [ - '--headless', - '--disable-gpu', - '--no-sandbox', - '--remote-debugging-port=9222', - '--window-size=1440,900' - ] + "Chrome": { + mode: 'ci', + args: [ + '--headless', + '--disable-gpu', + '--no-sandbox', + '--remote-debugging-port=9222', + '--window-size=1440,900' + ] + } } }; diff --git a/tests/unit/components/base-layer-test.js b/tests/unit/components/base-layer-test.js index 033df9d01..cb5befe12 100644 --- a/tests/unit/components/base-layer-test.js +++ b/tests/unit/components/base-layer-test.js @@ -21,27 +21,28 @@ test('it should throw at init', function (assert) { test('it should call layer.setZIndex on _setLayerZIndex', function (assert) { assert.expect(1); + var done = assert.async(1); let setZIndex = sinon.spy(); let component = this.subject({ - createLayer() { + createLayer: function() { return { - setZIndex + setZIndex: setZIndex }; } }); - let leafletLayerPromiseResolved = assert.async(); component.get('_leafletLayerPromise').then((leafletLayer) => { component._setLayerZIndex(); - assert.ok(setZIndex.called); + assert.equal(setZIndex.callCount, 1); }).finally(() => { - leafletLayerPromiseResolved(); + done(); }); }); test('should call _setLayerVisibility and _setLayerZIndex on render', function (assert) { assert.expect(1); + var done = assert.async(1); let setLayerVisibility = sinon.spy(); @@ -52,16 +53,16 @@ test('should call _setLayerVisibility and _setLayerZIndex on render', function ( this.render(); - let leafletLayerPromiseResolved = assert.async(); component.get('_leafletLayerPromise').then((leafletLayer) => { assert.ok(setLayerVisibility.called, 'should call visibilityDidChange'); }).finally(() => { - leafletLayerPromiseResolved(); + done(); }); }); test('should call container addLayer/removeLayer based on visibility property', function(assert) { assert.expect(4); + var done = assert.async(1); let addLayer = sinon.spy(); let removeLayer = sinon.spy(); @@ -81,7 +82,6 @@ test('should call container addLayer/removeLayer based on visibility property', } }); - let leafletLayerPromiseResolved = assert.async(); component.get('_leafletLayerPromise').then((leafletLayer) => { component.set('visibility', true); @@ -94,12 +94,13 @@ test('should call container addLayer/removeLayer based on visibility property', assert.ok(removeLayer.calledOnce, 'removeLayer should be called once'); assert.ok(removeLayer.calledWith(layer), 'removeLayer should be called with layer instance'); }).finally(() => { - leafletLayerPromiseResolved(); + done(); }); }); test('should check method addCustomFilter', function (assert) { assert.expect(9); + var done = assert.async(1); let component = this.subject({ createLayer: createLayer @@ -107,7 +108,6 @@ test('should check method addCustomFilter', function (assert) { this.render(); - let leafletLayerPromiseResolved = assert.async(); component.get('_leafletLayerPromise').then((leafletLayer) => { let filterEmpty = component.addCustomFilter(null); assert.equal(filterEmpty, null, 'filter is null'); @@ -131,6 +131,6 @@ test('should check method addCustomFilter', function (assert) { assert.equal(filter4.filters[1].firstValue, 'outerFilter', 'filter is contains outerFilter'); assert.equal(filter4.filters[2].firstValue, 'customFilter', 'filter is contains customFilter'); }).finally(() => { - leafletLayerPromiseResolved(); + done(); }); }); diff --git a/tests/unit/components/flexberry-map-test.js b/tests/unit/components/flexberry-map-test.js index fa8f25ead..1174c6274 100644 --- a/tests/unit/components/flexberry-map-test.js +++ b/tests/unit/components/flexberry-map-test.js @@ -48,8 +48,10 @@ test('test function queryToMap', function (assert) { assert.deepEqual(querySpy.args[0][1], e, 'Check call second arg to method fire'); e.results[0].features.then((result) => { assert.equal(result[0].id, 1, 'Cherck result id'); + querySpy.restore(); done(1); }); + done(1); }); }); diff --git a/tests/unit/components/layers/group-layer-test.js b/tests/unit/components/layers/group-layer-test.js index 32dd025a5..fd6685085 100644 --- a/tests/unit/components/layers/group-layer-test.js +++ b/tests/unit/components/layers/group-layer-test.js @@ -12,18 +12,31 @@ moduleForComponent('layers/group-layer', 'Unit | Component | layers/group layer' } }); -test('it return L.LayerGroup on createLayer', function(assert) { +test('it return L.LayerGroup on createLayer', function (assert) { assert.expect(1); - let component = this.subject({ leafletMap: leafletMap }); + let component = this.subject({ + leafletMap: leafletMap, + mapApi: { + getFromApi() { return {}; } + } + }); + let layer = component.createLayer(); assert.ok(layer instanceof L.LayerGroup, 'Expected L.LayerGroup instance'); }); -test('it not call _leafletObject.setZIndex on setZIndex', function(assert) { +test('it not call _leafletObject.setZIndex on setZIndex', function (assert) { assert.expect(1); + var done = assert.async(1); + + let component = this.subject({ + leafletMap: leafletMap, + mapApi: { + getFromApi() { return {}; } + } + }); - let component = this.subject({ leafletMap: leafletMap }); let leafletLayerPromiseResolved = assert.async(); component.get('_leafletLayerPromise').then((leafletLayer) => { let layer = component.get('_leafletObject'); @@ -34,5 +47,7 @@ test('it not call _leafletObject.setZIndex on setZIndex', function(assert) { assert.equal(spy.callCount, 0); }).finally(() => { leafletLayerPromiseResolved(); + + done(); }); }); diff --git a/tests/unit/components/layers/odata-vector-layer-test.js b/tests/unit/components/layers/odata-vector-layer-test.js index 20fa0f1f8..39d6d430a 100644 --- a/tests/unit/components/layers/odata-vector-layer-test.js +++ b/tests/unit/components/layers/odata-vector-layer-test.js @@ -487,9 +487,10 @@ test('loadLayerFeatures() with featureIds=null', function(assert) { done(); }); }).finally(() => { - done(); getmapApiStub.restore(); getPkFieldStub.restore(); + + done(); }); assert.ok(component, 'Create odata-layer'); @@ -520,8 +521,9 @@ test('getLayerFeatures() with featureIds=null', function(assert) { done(); }); }).finally(() => { - done(); getCountFeaturesStub.restore(); + + done(); }); assert.ok(component, 'Create odata-layer'); @@ -596,30 +598,44 @@ test('test methos identify()', function(assert) { assert.equal(spyGetFeature.getCall(0).args[0]._attributePath, 'shape'); assert.equal(spyGetFeature.getCall(0).args[0]._intersectsValue, 'SRID=4326;POLYGON((10 30, 40 40, 40 20, 20 10, 10 30))'); - done(); spyGetFeature.restore(); + + done(); }); }); test('test method createAdapterForModel() with odataUrl', function(assert) { assert.expect(1); + var done = assert.async(1); Ember.$.extend(param, { 'odataUrl': 'http://localhost:6500/odata/' }); - let component = this.subject(param); - let adapterModel = component.createAdapterForModel(); + let component = this.subject(param); - assert.ok(adapterModel); + component.get('_leafletLayerPromise').then((leafletLayer) => { + component.set('_leafletObject', leafletLayer); + leafletLayer.promiseLoadLayer.then(() => { + let adapterModel = component.createAdapterForModel(); + assert.ok(adapterModel); + done(); + }); + }); }); -test('test method createAdapterForModel() without odataUrl', function(assert) { +test('test method createAdapterForModel() without odataUrl', function (assert) { assert.expect(1); + var done = assert.async(1); let component = this.subject(param); - let adapterModel = component.createAdapterForModel(); - - assert.notOk(adapterModel); + component.get('_leafletLayerPromise').then((leafletLayer) => { + component.set('_leafletObject', leafletLayer); + leafletLayer.promiseLoadLayer.then(() => { + let adapterModel = component.createAdapterForModel(); + assert.notOk(adapterModel); + done(); + }); + }); }); test('test method createDynamicModel() with json', function(assert) { @@ -757,7 +773,6 @@ test('test method createDynamicModel() with json with parent', function(assert) assert.equal(spyCreateModelHierarchy.callCount, 2); - done(); spyRegister.restore(); spyCreateAdapterForModel.restore(); spyCreateModel.restore(); @@ -767,6 +782,8 @@ test('test method createDynamicModel() with json with parent', function(assert) stubAjax.restore(); spyCreateModelHierarchy.restore(); _lookupFactoryStub.restore(); + + done(); }); }); @@ -784,8 +801,10 @@ test('test method createDynamicModel() without json', function(assert) { component.createDynamicModel().catch((error) => { assert.equal(error, 'Can\'t create dynamic model: test-model. Error: ModelName and metadataUrl is empty'); - done(); + + registerStub.restore(); _lookupFactoryStub.restore(); + done(); }); }); @@ -796,10 +815,15 @@ test('test method createDynamicModel() already registered', function(assert) { let _lookupFactoryStub = sinon.stub(Ember.getOwner(this), '_lookupFactory'); _lookupFactoryStub.returns(1); + let spyContinueLoad = sinon.spy(component, 'continueLoad'); + component.createDynamicModel().then((msg) => { assert.equal(msg, 'Model already registered: test-model'); - done(); + }).finally(() => { _lookupFactoryStub.restore(); + spyContinueLoad.restore(); + + done(); }); }); @@ -845,7 +869,7 @@ test('test method createVectorLayer() without dynamicModel', function(assert) { assert.equal(spyAjax.callCount, 0); assert.equal(spyCreateDynamicModel.callCount, 0); assert.equal(spyCreateModelHierarchy.callCount, 0); - done(); + spyContinueLoad.restore(); _createVectorLayerSpy.restore(); spyAjax.restore(); @@ -853,6 +877,8 @@ test('test method createVectorLayer() without dynamicModel', function(assert) { spyCreateModelHierarchy.restore(); _lookupFactoryStub.restore(); registerStub.restore(); + + done(); }); }); @@ -889,7 +915,7 @@ test('test method createVectorLayer() with dynamicModel=true', function(assert) assert.equal(stubAjax.getCall(0).args[0].url, 'assert/felxberry/models/test-model.json'); assert.equal(spyCreateDynamicModel.callCount, 1); assert.equal(spyCreateModelHierarchy.callCount, 1); - done(); + spyContinueLoad.restore(); _createVectorLayerSpy.restore(); spyCreateDynamicModel.restore(); @@ -897,6 +923,8 @@ test('test method createVectorLayer() with dynamicModel=true', function(assert) spyCreateModelHierarchy.restore(); _lookupFactoryStub.restore(); registerStub.restore(); + + done(); }); }); @@ -920,9 +948,10 @@ test('test method save() no modified objects', function(assert) { assert.equal(realCountArr(leafletObject.models), 0); assert.equal(leafletObject.getLayers().length, 2); assert.equal(spyBatchUpdate.callCount, 0); - done(); spyBatchUpdate.restore(); + + done(); }); }); }); @@ -999,11 +1028,12 @@ test('test method save() with objects', function(assert) { assert.equal(leafletObject.getLayers().length, 1); assert.equal(leafletObject._labelsLayer.getLayers().length, 0); assert.equal(leafletObject.getLayers()[0].state, 'exist'); - done(); spyBatchUpdate.restore(); stubGetmapApi.restore(); _getModelLayerFeatureStub.restore(); + + done(); }; leafletObject.once('save:success', saveSuccess); @@ -1122,11 +1152,13 @@ test('test method createModelHierarchy() with 3 parent', function(assert) { assert.ok(model); assert.ok(dataModel); assert.ok(modelMixin); - done(); + stubAjax.restore(); spyCreateModel.restore(); spyCreateMixin.restore(); spyCreateModelHierarchy.restore(); + + done(); }); }); @@ -1318,13 +1350,16 @@ test('test method getNearObject()', function(assert) { assert.equal(getObjectCenterSpy.callCount, 3); assert.equal(_getDistanceBetweenObjectsSpy.callCount, 1); }).finally(() => { - done(1); getmapApiStub.restore(); getObjectCenterSpy.restore(); _getDistanceBetweenObjectsSpy.restore(); stubAjax.restore(); _callAjaxStub.restore(); + registerStub.restore(); + + done(1); }); + assert.ok(promise instanceof Ember.RSVP.Promise); done(1); }); diff --git a/tests/unit/components/layers/wfs-layer-test.js b/tests/unit/components/layers/wfs-layer-test.js index 774bacfd1..7f9410f1a 100644 --- a/tests/unit/components/layers/wfs-layer-test.js +++ b/tests/unit/components/layers/wfs-layer-test.js @@ -193,9 +193,14 @@ test('getLayerFeatures() with options showExisting = false and continueLoading = layer: 'f34ea73d-9f00-4f02-b02d-675d459c972b', results: Ember.A() }; + component._leafletObject = res.target; component.getLayerFeatures(e).then((layers) => { assert.ok(layers, 'Get feature of layers with showExisting = false and continueLoading = true'); + }).finally(() => { + getmapApiStub.restore(); + getPkFieldStub.restore(); + done(); }); }); @@ -227,6 +232,10 @@ test('_addLayersOnMap() with options showExisting = true and continueLoading = f component._addLayersOnMap(layers); assert.equal(layers[0].options.pane, component.get('_pane'), 'Pane on object eqals pane on layer'); assert.equal(layers[0].options.renderer, component.get('_renderer'), 'Renderer on object eqals renderer on layer'); + + getmapApiStub.restore(); + getLayerFeatureIdStub.restore(); + done(); }); @@ -263,6 +272,10 @@ test('getLayerFeatures() with options showExisting = true', function (assert) { component.getLayerFeatures(e).then((layers) => { assert.ok(layers, 'Get feature of layers with showExisting = true'); + + getmapApiStub.restore(); + getLayerFeatureIdStub.restore(); + done(); }); }); @@ -299,9 +312,12 @@ test('loadLayerFeatures() with options showExisting = false', function (assert) component.loadLayerFeatures(e).then((layers) => { assert.ok(layers, 'Load feature of layers with showExisting = false'); assert.equal(addCustomFilterSpy.callCount, 1, 'call addCustomFilter'); - done(); addCustomFilterSpy.restore(); + getmapApiStub.restore(); + getPkFieldStub.restore(); + + done(); }); }); @@ -339,6 +355,8 @@ test('loadLayerFeatures() with options showExisting = true', function (assert) { component._leafletObject.loadFeatures = () => new Ember.RSVP.resolve(); component.loadLayerFeatures(e).then((layers) => { assert.ok(layers, 'Load feature of layers with showExisting = true'); + getmapApiStub.restore(); + getPkFieldStub.restore(); done(); }); }); @@ -398,6 +416,10 @@ test('loadLayerFeatures() with options showExisting = false, call 2 times', func done(); component.loadLayerFeatures(e).then((layers) => { assert.equal(layers.getLayers().length, 1, 'Load feature of layers with showExisting = false, 2 times'); + + getmapApiStub.restore(); + getPkFieldStub.restore(); + done(); }); }); @@ -450,6 +472,10 @@ test('test method clearChanges() with no changes', function (assert) { component.clearChanges(); assert.equal(leafletMap.editTools.editLayer.getLayers().length, 0); + + getmapApiStub.restore(); + getLayerFeatureIdStub.restore(); + done(); }); }); @@ -511,6 +537,10 @@ test('test method clearChanges() with create', function (assert) { component.clearChanges(); assert.equal(leafletMap.editTools.editLayer.getLayers().length, 0); + + getmapApiStub.restore(); + getLayerFeatureIdStub.restore(); + done(); }); }); @@ -562,6 +592,10 @@ test('test method clearChanges() with update', function (assert) { component.clearChanges(); assert.equal(leafletMap.editTools.editLayer.getLayers().length, 0); + + getmapApiStub.restore(); + getLayerFeatureIdStub.restore(); + done(); }); }); @@ -611,11 +645,16 @@ test('test method clearChanges() with delete', function (assert) { component.clearChanges(); assert.equal(leafletMap.editTools.editLayer.getLayers().length, 0); + + getmapApiStub.restore(); + getLayerFeatureIdStub.restore(); + done(); }); }); }); }); + test('test getPkField without pkField', function (assert) { assert.expect(1); var done = assert.async(1); @@ -635,6 +674,7 @@ test('test getPkField without pkField', function (assert) { }); }); }); + test('test getPkField with pkField', function (assert) { assert.expect(1); var done = assert.async(1); @@ -655,6 +695,7 @@ test('test getPkField with pkField', function (assert) { }); }); }); + test('test editLayer', function (assert) { assert.expect(2); var done = assert.async(2); @@ -705,11 +746,15 @@ test('test editLayer', function (assert) { '7998208.303352221,6282204.143427601,7998205.77214398,6282035.717038031,7998313.982057768'; assert.equal(layerUpdate.feature.geometry.coordinates.toString(), coordinates); + getmapApiStub.restore(); + getLayerFeatureIdStub.restore(); + done(); }); }); }); }); + test('test getNearObject with wpsUrl', function (assert) { assert.expect(9); var done = assert.async(2); @@ -785,7 +830,6 @@ test('test getNearObject with wpsUrl', function (assert) { assert.equal(_getLayerFeatureIdSpy.callCount, 1); assert.equal(getLayerFeaturesStub.callCount, 1); }).finally(() => { - done(1); getmapApiStub.restore(); stubAjax.restore(); getLayerFeaturesStub.restore(); @@ -793,12 +837,15 @@ test('test getNearObject with wpsUrl', function (assert) { getObjectCenterSpy.restore(); _getDistanceBetweenObjectsSpy.restore(); _getLayerFeatureIdSpy.restore(); + + done(1); }); assert.ok(promise instanceof Ember.RSVP.Promise); done(1); }); }); }); + test('test getNearObject with wpsUrl, Nearest object not found', function (assert) { assert.expect(7); var done = assert.async(2); @@ -850,7 +897,6 @@ test('test getNearObject with wpsUrl, Nearest object not found', function (asser assert.equal(_getLayerFeatureIdSpy.callCount, 0); assert.equal(getLayerFeaturesStub.callCount, 0); }).finally(() => { - done(1); getmapApiStub.restore(); stubAjax.restore(); getLayerFeaturesStub.restore(); @@ -858,6 +904,8 @@ test('test getNearObject with wpsUrl, Nearest object not found', function (asser getObjectCenterSpy.restore(); _getDistanceBetweenObjectsSpy.restore(); _getLayerFeatureIdSpy.restore(); + + done(1); }); assert.ok(promise instanceof Ember.RSVP.Promise); done(1); @@ -999,7 +1047,6 @@ test('test getNearObject without wpsUrl, same layer', function (assert) { assert.equal(_calcNearestObjectSpy.callCount, 1); assert.equal(dwithinStub.callCount, 3); }).finally(() => { - done(1); getmapApiStub.restore(); _calcNearestObjectSpy.restore(); upDistanceSpy.restore(); @@ -1007,12 +1054,15 @@ test('test getNearObject without wpsUrl, same layer', function (assert) { _getDistanceBetweenObjectsSpy.restore(); _getLayerFeatureIdSpy.restore(); dwithinStub.restore(); + + done(1); }); assert.ok(promise instanceof Ember.RSVP.Promise); done(1); }); }); }); + test('test getNearObject without wpsUrl, other layer', function (assert) { assert.expect(10); var done = assert.async(2); @@ -1147,7 +1197,6 @@ test('test getNearObject without wpsUrl, other layer', function (assert) { assert.equal(_calcNearestObjectSpy.callCount, 1); assert.equal(dwithinStub.callCount, 3); }).finally(() => { - done(1); getmapApiStub.restore(); _calcNearestObjectSpy.restore(); upDistanceSpy.restore(); @@ -1155,12 +1204,16 @@ test('test getNearObject without wpsUrl, other layer', function (assert) { _getDistanceBetweenObjectsSpy.restore(); _getLayerFeatureIdSpy.restore(); dwithinStub.restore(); + + done(1); }); + assert.ok(promise instanceof Ember.RSVP.Promise); done(1); }); }); }); + test('test getNearObject without wpsUrl, Nearest object not found', function (assert) { assert.expect(8); var done = assert.async(2); @@ -1206,7 +1259,6 @@ test('test getNearObject without wpsUrl, Nearest object not found', function (as assert.equal(_calcNearestObjectSpy.callCount, 0); assert.equal(dwithinStub.callCount, 8); }).finally(() => { - done(1); getmapApiStub.restore(); _calcNearestObjectSpy.restore(); upDistanceSpy.restore(); @@ -1214,9 +1266,12 @@ test('test getNearObject without wpsUrl, Nearest object not found', function (as _getDistanceBetweenObjectsSpy.restore(); _getLayerFeatureIdSpy.restore(); dwithinStub.restore(); + + done(1); }); assert.ok(promise instanceof Ember.RSVP.Promise); done(1); }); }); }); + diff --git a/tests/unit/models/new-platform-flexberry-g-i-s-map-test.js b/tests/unit/models/new-platform-flexberry-g-i-s-map-test.js index ed896f3ec..399401adb 100644 --- a/tests/unit/models/new-platform-flexberry-g-i-s-map-test.js +++ b/tests/unit/models/new-platform-flexberry-g-i-s-map-test.js @@ -138,6 +138,7 @@ test('substitution _getModelLayerFeature', function (assert) { let _getModelLayerFeatureStub = sinon.stub(map, '_getModelLayerFeature'); _getModelLayerFeatureStub.withArgs(1).returns(objA); assert.ok(_getModelLayerFeatureStub(1)); + _getModelLayerFeatureStub.restore(); }); test('isContainsObject', function(assert) { @@ -163,6 +164,8 @@ test('isContainsObject', function(assert) { 'f34ea73d-9f00-4f02-b02d-675d459c972b', '0017782c-6f34-46b5-ac77-c0a65366c452').then((e) => { assert.notOk(e, 'Not contains'); }); + + _getModelLayerFeatureStub.restore(); }); test('getAreaExtends', function(assert) { @@ -203,6 +206,8 @@ test('getAreaExtends', function(assert) { '63b3f6fb-3d4c-4acc-ab93-1b4fa31f9b0e', 'd633ea1d-eb32-423f-8663-a38abc7ba094').then((e) => { assert.equal(e, 43187392.82526295, 'Not intersect'); }); + + _getModelLayerFeatureStub.restore(); }); test('getIntersectionArea', function(assert) { @@ -219,6 +224,7 @@ test('getIntersectionArea', function(assert) { resolve([null, objWithCrs, objB]); }) ); + _getModelLayerFeatureStub.withArgs('63b3f6fb-3d4c-4acc-ab93-1b4fa31f9b0e', ['d633ea1d-eb32-423f-8663-a38abc7ba094']).returns( new Ember.RSVP.Promise((resolve, reject) => { resolve([null, objWithCrs, objC]); @@ -236,6 +242,8 @@ test('getIntersectionArea', function(assert) { }).catch((e) => { assert.ok(e, 'Not intersect'); }); + + _getModelLayerFeatureStub.restore(); }); test('getDistanceBetweenObjects', function(assert) { @@ -246,6 +254,7 @@ test('getDistanceBetweenObjects', function(assert) { resolve([null, objWithCrs, L.geoJSON(objA[0].feature).getLayers()]); }) ); + _getModelLayerFeatureStub.withArgs('63b3f6fb-3d4c-4acc-ab93-1b4fa31f9b0e', ['45df35c7-f292-44f8-b328-5fd4be739233']).returns( new Ember.RSVP.Promise((resolve, reject) => { resolve([null, objWithCrs, L.geoJSON(objB[0].feature).getLayers()]); @@ -256,6 +265,8 @@ test('getDistanceBetweenObjects', function(assert) { '63b3f6fb-3d4c-4acc-ab93-1b4fa31f9b0e', '45df35c7-f292-44f8-b328-5fd4be739233').then((e) => { assert.equal(e, 536.4476316355142, 'distance'); }); + + _getModelLayerFeatureStub.restore(); }); test('getmulticircuitobject with difference', function(assert) { diff --git a/tests/unit/utils/feature-with-area-intersect-test.js b/tests/unit/utils/feature-with-area-intersect-test.js index 532267f8e..2563ce02f 100644 --- a/tests/unit/utils/feature-with-area-intersect-test.js +++ b/tests/unit/utils/feature-with-area-intersect-test.js @@ -81,6 +81,8 @@ test('test method featureWithAreaIntersect for two polygon', function(assert) { //Assert assert.equal(res.properties.intersectionArea, 43.97863930247094, 'Assert intersectArea'); assert.equal(stubConvertCoordinates.callCount, 0, 'Assert call count for method _convertObjectCoordinates'); + + stubConvertCoordinates.restore(); }); test('test method featureWithAreaIntersect for two polygon not intersect', function(assert) { @@ -107,4 +109,6 @@ test('test method featureWithAreaIntersect for two polygon not intersect', funct assert.equal(res.properties.intersectionArea, 0, 'Assert intersectArea'); assert.equal(stubConvertCoordinates.callCount, 1, 'Assert call count for method _convertObjectCoordinates'); assert.equal(stubConvertCoordinates.args[0][0], 'EPSG:32640', 'Assert first argument on method _convertObjectCoordinates'); + + stubConvertCoordinates.restore(); });