Skip to content

Commit 62d33b9

Browse files
committed
rm hasWebGLSupport early return in jasmine specs
- ... as WebGL is now supported on CI 🎉
1 parent aa1aaef commit 62d33b9

7 files changed

+0
-42
lines changed

test/jasmine/assets/has_webgl_support.js

-18
This file was deleted.

test/jasmine/tests/gl2d_click_test.js

-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ var Lib = require('@src/lib');
44
var createGraphDiv = require('../assets/create_graph_div');
55
var destroyGraphDiv = require('../assets/destroy_graph_div');
66
var customMatchers = require('../assets/custom_matchers');
7-
var hasWebGLSupport = require('../assets/has_webgl_support');
87

98
// cartesian click events events use the hover data
109
// from the mousemove events and then simulate
@@ -19,8 +18,6 @@ Plotly.register([
1918

2019
describe('Test hover and click interactions', function() {
2120

22-
if(!hasWebGLSupport('gl2d_click_test')) return;
23-
2421
var mock = require('@mocks/gl2d_14.json');
2522
var mock2 = require('@mocks/gl2d_pointcloud-basic.json');
2623
var mock3 = {

test/jasmine/tests/gl2d_date_axis_render_test.js

-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
var PlotlyInternal = require('@src/plotly');
22

3-
var hasWebGLSupport = require('../assets/has_webgl_support');
4-
53
var createGraphDiv = require('../assets/create_graph_div');
64
var destroyGraphDiv = require('../assets/destroy_graph_div');
75

86
describe('date axis', function() {
97

10-
if(!hasWebGLSupport('axes_test date axis')) return;
11-
128
var gd;
139

1410
beforeEach(function() {

test/jasmine/tests/gl_plot_interact_test.js

-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ var mouseEvent = require('../assets/mouse_event');
1111
var selectButton = require('../assets/modebar_button');
1212
var customMatchers = require('../assets/custom_matchers');
1313

14-
/*
15-
* WebGL interaction test cases fail on the CircleCI
16-
* most likely due to a WebGL/driver issue
17-
*
18-
*/
19-
2014
var MODEBAR_DELAY = 500;
2115

2216

test/jasmine/tests/mapbox_test.js

-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ var supplyLayoutDefaults = require('@src/plots/mapbox/layout_defaults');
77
var d3 = require('d3');
88
var createGraphDiv = require('../assets/create_graph_div');
99
var destroyGraphDiv = require('../assets/destroy_graph_div');
10-
var hasWebGLSupport = require('../assets/has_webgl_support');
1110
var mouseEvent = require('../assets/mouse_event');
1211
var customMatchers = require('../assets/custom_matchers');
1312
var failTest = require('../assets/fail_test');
@@ -176,8 +175,6 @@ describe('mapbox defaults', function() {
176175
describe('mapbox credentials', function() {
177176
'use strict';
178177

179-
if(!hasWebGLSupport('mapbox credentials')) return;
180-
181178
var dummyToken = 'asfdsa124331wersdsa1321q3';
182179
var gd;
183180

@@ -282,8 +279,6 @@ describe('mapbox credentials', function() {
282279
describe('mapbox plots', function() {
283280
'use strict';
284281

285-
if(!hasWebGLSupport('mapbox plots')) return;
286-
287282
var mock = require('@mocks/mapbox_0.json'),
288283
gd;
289284

test/jasmine/tests/parcoords_test.js

-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ var attributes = require('@src/traces/parcoords/attributes');
77

88
var createGraphDiv = require('../assets/create_graph_div');
99
var destroyGraphDiv = require('../assets/destroy_graph_div');
10-
var hasWebGLSupport = require('../assets/has_webgl_support');
1110
var mouseEvent = require('../assets/mouse_event');
1211

1312
// mock with two dimensions (one panel); special case, e.g. left and right panel is obv. the same
@@ -222,8 +221,6 @@ describe('parcoords initialization tests', function() {
222221

223222
describe('parcoords', function() {
224223

225-
if(!hasWebGLSupport('parcoords')) return;
226-
227224
beforeAll(function() {
228225
mock.data[0].dimensions.forEach(function(d) {
229226
d.values = d.values.slice(lineStart, lineStart + lineCount);

test/jasmine/tests/scattermapbox_test.js

-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ var convert = require('@src/traces/scattermapbox/convert');
77

88
var createGraphDiv = require('../assets/create_graph_div');
99
var destroyGraphDiv = require('../assets/destroy_graph_div');
10-
var hasWebGLSupport = require('../assets/has_webgl_support');
1110
var customMatchers = require('../assets/custom_matchers');
1211

1312
Plotly.setPlotConfig({
@@ -455,8 +454,6 @@ describe('scattermapbox convert', function() {
455454
describe('scattermapbox hover', function() {
456455
'use strict';
457456

458-
if(!hasWebGLSupport('scattermapbox hover')) return;
459-
460457
var hoverPoints = ScatterMapbox.hoverPoints;
461458

462459
var gd;

0 commit comments

Comments
 (0)