Skip to content

Commit 6d9a1b7

Browse files
archmojarchmoj
authored
Merge pull request #3661 from plotly/gl-clean-ci-run-jasmine2
Clean CI run of gl hovers
2 parents e76536b + d63960e commit 6d9a1b7

6 files changed

+78
-57
lines changed

‎test/jasmine/tests/cone_test.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,12 +266,12 @@ describe('Test cone interactions', function() {
266266

267267
function _hover() {
268268
mouseEvent('mouseover', 200, 200);
269-
return delay(20)();
270269
}
271270

272271
Plotly.plot(gd, fig)
273272
.then(delay(20))
274273
.then(_hover)
274+
.then(delay(20))
275275
.then(function() {
276276
assertHoverLabelContent({
277277
nums: ['x: 2', 'y: 2', 'z: 2', 'norm: 3.00'].join('\n')
@@ -281,6 +281,7 @@ describe('Test cone interactions', function() {
281281
})
282282
.then(delay(20))
283283
.then(_hover)
284+
.then(delay(20))
284285
.then(function() {
285286
assertHoverLabelContent({
286287
nums: ['u: 0', 'v: 3', 'w: 0'].join('\n')
@@ -302,6 +303,7 @@ describe('Test cone interactions', function() {
302303
})
303304
.then(delay(20))
304305
.then(_hover)
306+
.then(delay(20))
305307
.then(function() {
306308
assertHoverLabelContent({
307309
name: 'trace 0',
@@ -317,6 +319,7 @@ describe('Test cone interactions', function() {
317319
})
318320
.then(delay(20))
319321
.then(_hover)
322+
.then(delay(20))
320323
.then(function() {
321324
assertHoverLabelContent({
322325
name: 'LOOKOUT',
@@ -330,7 +333,6 @@ describe('Test cone interactions', function() {
330333
it('@gl should display hover labels (multi-trace case)', function(done) {
331334
function _hover() {
332335
mouseEvent('mouseover', 282, 240);
333-
return delay(20)();
334336
}
335337

336338
Plotly.plot(gd, [{
@@ -359,6 +361,7 @@ describe('Test cone interactions', function() {
359361
})
360362
.then(delay(20))
361363
.then(_hover)
364+
.then(delay(20))
362365
.then(function() {
363366
assertHoverLabelContent({
364367
nums: ['x: 1', 'y: 1', 'z: 1', 'norm: 1.41'].join('\n'),

‎test/jasmine/tests/gl2d_click_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ describe('Test hover and click interactions', function() {
183183
afterEach(function(done) {
184184
Plotly.purge(gd);
185185
destroyGraphDiv();
186-
setTimeout(done, 1000);
186+
setTimeout(done, 1500);
187187
});
188188

189189
it('@gl should output correct event data for scattergl', function(done) {

‎test/jasmine/tests/gl2d_pointcloud_test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ describe('pointcloud traces', function() {
230230
.then(function() {
231231
_assertRange('base', [-0.548, 9.548], [-1.415, 10.415]);
232232
})
233+
.then(delay(40))
233234
.then(function() { _drag([200, 200], [350, 350]); })
234235
.then(delay(40))
235236
.then(function() {
@@ -247,6 +248,7 @@ describe('pointcloud traces', function() {
247248
.then(function() {
248249
return Plotly.relayout(gd, 'dragmode', 'pan');
249250
})
251+
.then(delay(40))
250252
.then(function() { _drag([200, 200], [350, 350]); })
251253
.then(delay(40))
252254
.then(function() {

0 commit comments

Comments
 (0)