commit 231c7542ce2ca3619dabd9bd7875a57181c945e3
author Matteo Scandolo <teo@onlab.us> Fri May 20 11:13:11 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri May 20 19:28:06 2016 +0000
tree 67b94e3b077722a072528633270dec2657c683a1
parent 92b016b1c047904261e8572819aa5e74ddc44ee7

[WEB-GUI Tests] Fixing UI unit tests

Change-Id: I6eb28a706e148da17f8b2d7d5f8e44821851462a

web/gui/src/main/webapp/tests/app/fw/svg/geodata-spec.js

diff --git a/web/gui/src/main/webapp/tests/app/fw/svg/geodata-spec.js b/web/gui/src/main/webapp/tests/app/fw/svg/geodata-spec.js
index 20406dd..52705f0 100644
--- a/web/gui/src/main/webapp/tests/app/fw/svg/geodata-spec.js
+++ b/web/gui/src/main/webapp/tests/app/fw/svg/geodata-spec.js
@@ -35,9 +35,9 @@
         expect(gds).toBeDefined();
     });
 
-    xit('should define api functions', function () {
+    it('should define api functions', function () {
         expect(fs.areFunctions(gds, [
-            'clearCache', 'fetchTopoData', 'createPathGenerator'
+            'clearCache', 'fetchTopoData', 'createPathGenerator', 'rescaleProjection'
         ])).toBeTruthy();
     });
 
@@ -46,20 +46,20 @@
         expect(promise).toBeNull();
     });
 
-    xit('should augment the id of a bundled map', function () {
+    it('should augment the id of a bundled map', function () {
         var id = '*foo';
         promise = gds.fetchTopoData(id);
         expect(promise.meta).toBeDefined();
         expect(promise.meta.id).toBe(id);
-        expect(promise.meta.url).toBe('data/map/foo.json');
+        expect(promise.meta.url).toBe('data/map/foo.topojson');
     });
 
-    xit('should treat an external id as the url itself', function () {
+    it('should treat an external id as the url itself', function () {
         var id = 'some/path/to/foo';
         promise = gds.fetchTopoData(id);
         expect(promise.meta).toBeDefined();
         expect(promise.meta.id).toBe(id);
-        expect(promise.meta.url).toBe(id + '.json');
+        expect(promise.meta.url).toBe(id + '.topojson');
     });
 
     it('should cache the returned objects', function () {
@@ -91,16 +91,16 @@
     });
 
 
-    xit('should log a warning if data fails to load', function () {
+    it('should log a warning if data fails to load', function () {
         var id = 'foo';
-        $httpBackend.expectGET('foo.json').respond(404, 'Not found');
+        $httpBackend.expectGET('foo.topojson').respond(404, 'Not found');
         spyOn($log, 'warn');
 
         promise = gds.fetchTopoData(id);
         $httpBackend.flush();
         expect(promise.topodata).toBeUndefined();
         expect($log.warn)
-            .toHaveBeenCalledWith('Failed to retrieve map TopoJSON data: foo.json',
+            .toHaveBeenCalledWith('Failed to retrieve map TopoJSON data: foo.topojson',
             404, 'Not found');
     });
 
@@ -125,8 +125,8 @@
         return simpleTopology({type: "LineString", arcs: [1, 2]});
     }
 
-    xit('should use default settings if none are supplied', function () {
-        var gen = gds.createPathGenerator(simpleLineStringTopo());
+    it('should use default settings if none are supplied', function () {
+        var gen = gds.createPathGenerator(simpleLineStringTopo(), {adjustScale: true});
         expect(gen.settings.objectTag).toBe('states');
         expect(gen.settings.logicalSize).toBe(1000);
         expect(gen.settings.mapFillScale).toBe(.95);
@@ -143,8 +143,8 @@
         expect(gen.settings.mapFillScale).toBe(.80);
     });
 
-    xit('should create transformed geodata, and a path generator', function () {
-        var gen = gds.createPathGenerator(simpleLineStringTopo());
+    it('should create transformed geodata, and a path generator', function () {
+        var gen = gds.createPathGenerator(simpleLineStringTopo(), {adjustScale: true});
         expect(fs.isO(gen.settings)).toBeTruthy();
         expect(fs.isO(gen.geodata)).toBeTruthy();
         expect(fs.isF(gen.pathgen)).toBeTruthy();