Skip to content

Commit c419b75

Browse files
committed
try to fix Ci test env setup
Signed-off-by: Ihor Dykhta <dikhta.igor@gmail.com>
1 parent d5fdfd6 commit c419b75

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

test/helpers/layer-utils.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/* eslint-disable enzyme-deprecation/no-mount */
55
import {LayerManager, MapView} from '@deck.gl/core';
66
import React from 'react';
7-
import {gl} from '@deck.gl/test-utils';
7+
import {gl, device} from '@deck.gl/test-utils';
88
import sinon from 'sinon';
99
import {mount} from 'enzyme';
1010
import {console as Console} from 'global/window';
@@ -209,7 +209,7 @@ export function testRenderDeckLayer(t, layerType, deckLayers, {viewport, layerMa
209209
height: viewport.height,
210210
viewState: viewport
211211
});
212-
deckLayerManager = new LayerManager(gl, {viewport: testViewport});
212+
deckLayerManager = new LayerManager(device, {viewport: testViewport});
213213
}
214214

215215
const spy = sinon.spy(Console, 'error');
@@ -322,7 +322,7 @@ export function testUpdateLayer(t, {layerConfig, shouldUpdate}) {
322322
viewState: mapState
323323
});
324324

325-
const layerManager = new LayerManager(gl, {viewport: testViewport});
325+
const layerManager = new LayerManager(device, {viewport: testViewport});
326326

327327
let rendered = renderLayerByState(t, stateWithLayer, layerManager);
328328
const attributeValues = Object.keys(

test/setup-browser-env.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,11 @@ global.fetch = window.fetch;
128128

129129
// Create a dummy canvas for the headless gl context
130130
const canvas = global.document.createElement('canvas');
131-
canvas.width = gl.drawingBufferWidth;
132-
canvas.height = gl.drawingBufferHeight;
133-
gl.canvas = canvas;
131+
if (gl && typeof gl === 'object') {
132+
canvas.width = gl.drawingBufferWidth;
133+
canvas.height = gl.drawingBufferHeight;
134+
gl.canvas = canvas;
135+
}
134136

135137
Object.keys(global.window).forEach(property => {
136138
if (typeof global[property] === 'undefined') {

0 commit comments

Comments
 (0)