Skip to content

Commit def0ddd

Browse files
committed
Attempt to fix failing Travis tests
1 parent faafedf commit def0ddd

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

Specs/Scene/PickSpec.js

+8-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ defineSuite([
2020
'Scene/Primitive',
2121
'Scene/Scene',
2222
'Scene/SceneMode',
23-
'Scene/SingleTileImageryProvider',
2423
'Specs/Cesium3DTilesTester',
2524
'Specs/createCanvas',
2625
'Specs/createScene',
@@ -47,7 +46,6 @@ defineSuite([
4746
Primitive,
4847
Scene,
4948
SceneMode,
50-
SingleTileImageryProvider,
5149
Cesium3DTilesTester,
5250
createCanvas,
5351
createScene,
@@ -149,9 +147,6 @@ defineSuite([
149147
function createGlobe() {
150148
var globe = new Globe();
151149
scene.globe = globe;
152-
var layerCollection = globe.imageryLayers;
153-
layerCollection.removeAll();
154-
layerCollection.addImageryProvider(new SingleTileImageryProvider({url : 'Data/Images/Red16x16.png'}));
155150
globe.depthTestAgainstTerrain = true;
156151
return pollToPromise(function() {
157152
scene.render();
@@ -823,6 +818,10 @@ defineSuite([
823818
});
824819

825820
it('samples height from the globe', function() {
821+
if (!scene.sampleHeightSupported) {
822+
return;
823+
}
824+
826825
var cartographic = new Cartographic(0.0, 0.0);
827826
return createGlobe().then(function() {
828827
expect(scene).toSampleHeightAndCall(function(height) {
@@ -954,6 +953,10 @@ defineSuite([
954953
});
955954

956955
it('clamps to the globe', function() {
956+
if (!scene.sampleHeightSupported) {
957+
return;
958+
}
959+
957960
var cartesian = Cartesian3.fromRadians(0.0, 0.0, 100000.0);
958961
return createGlobe().then(function() {
959962
expect(scene).toClampToHeightAndCall(function(position) {

0 commit comments

Comments
 (0)