From 6d4a71f81face314fb484a5a7562225daf972d8a Mon Sep 17 00:00:00 2001 From: Ryan Coulson Date: Tue, 28 May 2019 09:42:26 -0400 Subject: [PATCH] fix(spec): fix unit test errors --- package-lock.json | 2 +- package.json | 2 +- spec/attribFCSpec.js | 2 ++ spec/imageRecordSpec.js | 4 +++- spec/layerRecordSpec.js | 12 ++++++------ spec/projSpec.js | 11 +++++++---- spec/querySpec.js | 1 + 7 files changed, 21 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index af74afe4..e3c37b3e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "geoApi", - "version": "3.0.0", + "version": "3.1.0-1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 278ffe73..dfd01018 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "geoApi", - "version": "3.0.0", + "version": "3.1.0-1", "description": "", "main": "src/index.js", "dependencies": { diff --git a/spec/attribFCSpec.js b/spec/attribFCSpec.js index 3187052e..50415076 100644 --- a/spec/attribFCSpec.js +++ b/spec/attribFCSpec.js @@ -25,6 +25,8 @@ describe('AttribFC', () => { } } }, + _attribsAdded: () => {}, + dataSource: () => {}, _layer: { }, _esriRequest: () => { const x = { diff --git a/spec/imageRecordSpec.js b/spec/imageRecordSpec.js index 1ade24d8..7e82b274 100644 --- a/spec/imageRecordSpec.js +++ b/spec/imageRecordSpec.js @@ -79,7 +79,7 @@ class FakeGeoApiSymbology { generatePlaceholderSymbology () {} mapServerToLocalLegend () { return new Promise((resolve) => { - resolve(); + resolve({ 'layers': [{ 'legend': { map: () => {}}}] }); }); } } @@ -161,9 +161,11 @@ describe('imageRecord', () => { expect(imageRecordObject).not.toBe(undefined); }); + it('should how return an error when onLoad was called', () => { const imageRecordObject = new imageRecord.ImageRecord(FakeLayerObject, apiRef, config, esriLayer); + /* Second test fails here */ imageRecordObject.onLoad(); }); }); diff --git a/spec/layerRecordSpec.js b/spec/layerRecordSpec.js index 468eb1c2..34334780 100644 --- a/spec/layerRecordSpec.js +++ b/spec/layerRecordSpec.js @@ -210,34 +210,34 @@ describe('layerRecord', () => { layerRecordObject.bindEvents(layer); }); - xit('should add a state change listener then remove it', () => { + it('should add a state change listener then remove it', () => { const layerRecordObject = new layerRecord.LayerRecord(FakeLayerObject, apiRef, config, esriLayer); // add the state listener let listenerCallback = layerRecordObject.addStateListener('listenerCallback'); expect(listenerCallback).toEqual('listenerCallback'); - expect(layerRecordObject._stateListeners.includes('listenerCallback')).toBe(true); + expect(layerRecordObject._stateEvent._listeners.includes('listenerCallback')).toBe(true); // remove the state listener layerRecordObject.removeStateListener('listenerCallback'); - expect(layerRecordObject._stateListeners.includes('listenerCallback')).toBe(false); + expect(layerRecordObject._stateEvent._listeners.includes('listenerCallback')).toBe(false); }); - xit('should add hover listener then remove it', () => { + it('should add hover listener then remove it', () => { const layerRecordObject = new layerRecord.LayerRecord(FakeLayerObject, apiRef, config, esriLayer); // add the state listener let listenerCallback = layerRecordObject.addHoverListener('listenerCallback'); expect(listenerCallback).toEqual('listenerCallback'); - expect(layerRecordObject._hoverListeners.includes('listenerCallback')).toBe(true); + expect(layerRecordObject._hoverEvent._listeners.includes('listenerCallback')).toBe(true); // remove the state listener layerRecordObject.removeHoverListener('listenerCallback'); - expect(layerRecordObject._hoverListeners.includes('listenerCallback')).toBe(false); + expect(layerRecordObject._hoverEvent._listeners.includes('listenerCallback')).toBe(false); }); it('should create an option object for the physical layer', () => { diff --git a/spec/projSpec.js b/spec/projSpec.js index cfe767e8..c4f89283 100644 --- a/spec/projSpec.js +++ b/spec/projSpec.js @@ -5,10 +5,14 @@ const projBuilder = require('../src/proj.js'); let fakeEsri = { EsriExtent: {}, - GeometryService: () => {}, + GeometryService: FakeGeoService, ProjectParameters: () => {} }; +function FakeGeoService() { + return { project: () => {} } +} + function makeFakeEsriExtent(o) { return { xmin:o.x0, ymin:o.y0, xmax:o.x1, ymax:o.y1, @@ -138,12 +142,11 @@ describe('esri projection conversion function', () => { // calls fake geosvc and makes sure the parameters are correct it('should call esri server from wrapper function', () => { let esri = projBuilder(fakeEsri); - spyOn(fakeEsri, 'GeometryService'); + spyOn(fakeEsri, 'GeometryService').and.callThrough(); spyOn(fakeEsri, 'ProjectParameters'); // fake call to esri server - let newPt = esri.esriServerProject('http://sncr01wbingsdv1.ncr.' + - 'int.ec.gc.ca/arcgis/rest/services/Utilities/Geometry/GeometryServer', [0], 12345); + let newPt = esri.esriServerProject('http://section917.cloudapp.net/arcgis/rest/services/Utilities/Geometry/GeometryServer', [0], 12345); expect(fakeEsri.GeometryService).toHaveBeenCalled(); expect(fakeEsri.ProjectParameters).toHaveBeenCalled(); expect(newPt).toEqual(jasmine.any(Promise)); diff --git a/spec/querySpec.js b/spec/querySpec.js index b332aa7e..3651b490 100644 --- a/spec/querySpec.js +++ b/spec/querySpec.js @@ -59,6 +59,7 @@ describe('Query', () => { returnGeometry: true, outSpatialReference: new FakeSpatialReference() }; + const query = queryGeo.queryGeometry(options); expect(fakeBundle.Query).toHaveBeenCalled(); expect(fakeBundle.QueryTask).toHaveBeenCalled();