Merge pull request #6177 from AnalyticalGraphicsInc/node

Add smokescreen test for Node support to travis.
CesiumGS · Feb 1, 2018 · bf3bf64 · bf3bf64
2 parents 39f1b24 + 2896e38
commit bf3bf64
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -39,6 +39,10 @@ script:
   - npm run test -- --browsers Electron --failTaskOnError --webgl-stub --release --suppressPassed
   - echo -en 'travis_fold:end:script test.release\\r'
 
+  - echo 'test node' && echo -en 'travis_fold:start:script test.node\\r'
+  - node index.js
+  - echo -en 'travis_fold:end:script test.node\\r'
+
   - echo 'cloc' && echo -en 'travis_fold:start:script.cloc\\r'
   - npm run cloc
   - echo -en 'travis_fold:end:script.cloc\\r'
diff --git a/Source/Scene/GroundPrimitive.js b/Source/Scene/GroundPrimitive.js
@@ -52,10 +52,6 @@ define([
         }
     };
 
-    var terrainHeightsResource = new Resource({
-        url: buildModuleUrl('Assets/approximateTerrainHeights.json')
-    });
-
     /**
      * A ground primitive represents geometry draped over the terrain in the {@link Scene}.  The geometry must be from a single {@link GeometryInstance}.
      * Batching multiple geometries is not yet supported.
@@ -667,7 +663,7 @@ define([
             return initPromise;
         }
 
-        GroundPrimitive._initPromise = terrainHeightsResource.fetchJson().then(function(json) {
+        GroundPrimitive._initPromise = Resource.fetchJson(buildModuleUrl('Assets/approximateTerrainHeights.json')).then(function(json) {
             GroundPrimitive._initialized = true;
             GroundPrimitive._terrainHeights = json;
         });