Skip to content

Commit 26278de

Browse files
alexcjohnsonalexcjohnson
committed
some test cleanup
1 parent 970db80 commit 26278de

File tree

3 files changed

+61
-69
lines changed

3 files changed

+61
-69
lines changed

‎test/jasmine/tests/axes_test.js

+26-39
Original file line numberDiff line numberDiff line change
@@ -2631,11 +2631,9 @@ describe('Test axes', function() {
26312631

26322632
Plotly.plot(gd, data)
26332633
.then(function() {
2634-
initialSize = Lib.extendDeep({}, gd._fullLayout._size);
26352634
expect(gd._fullLayout.xaxis._lastangle).toBe(30);
2636-
})
2637-
.then(function() {
2638-
previousSize = Lib.extendDeep({}, gd._fullLayout._size);
2635+
2636+
initialSize = previousSize = Lib.extendDeep({}, gd._fullLayout._size);
26392637
return Plotly.relayout(gd, {'yaxis.automargin': true});
26402638
})
26412639
.then(function() {
@@ -2644,9 +2642,8 @@ describe('Test axes', function() {
26442642
expect(size.r).toBe(previousSize.r);
26452643
expect(size.b).toBe(previousSize.b);
26462644
expect(size.t).toBe(previousSize.t);
2647-
})
2648-
.then(function() {
2649-
previousSize = Lib.extendDeep({}, gd._fullLayout._size);
2645+
2646+
previousSize = Lib.extendDeep({}, size);
26502647
return Plotly.relayout(gd, {'xaxis.automargin': true});
26512648
})
26522649
.then(function() {
@@ -2655,9 +2652,8 @@ describe('Test axes', function() {
26552652
expect(size.r).toBe(previousSize.r);
26562653
expect(size.b).toBeGreaterThan(previousSize.b);
26572654
expect(size.t).toBe(previousSize.t);
2658-
})
2659-
.then(function() {
2660-
previousSize = Lib.extendDeep({}, gd._fullLayout._size);
2655+
2656+
previousSize = Lib.extendDeep({}, size);
26612657
savedBottom = previousSize.b;
26622658
return Plotly.relayout(gd, {'xaxis.tickangle': 45});
26632659
})
@@ -2667,9 +2663,8 @@ describe('Test axes', function() {
26672663
expect(size.r).toBe(previousSize.r);
26682664
expect(size.b).toBeGreaterThan(previousSize.b);
26692665
expect(size.t).toBe(previousSize.t);
2670-
})
2671-
.then(function() {
2672-
previousSize = Lib.extendDeep({}, gd._fullLayout._size);
2666+
2667+
previousSize = Lib.extendDeep({}, size);
26732668
return Plotly.relayout(gd, {'xaxis.tickangle': 30});
26742669
})
26752670
.then(function() {
@@ -2678,9 +2673,8 @@ describe('Test axes', function() {
26782673
expect(size.r).toBe(previousSize.r);
26792674
expect(size.b).toBe(savedBottom);
26802675
expect(size.t).toBe(previousSize.t);
2681-
})
2682-
.then(function() {
2683-
previousSize = Lib.extendDeep({}, gd._fullLayout._size);
2676+
2677+
previousSize = Lib.extendDeep({}, size);
26842678
return Plotly.relayout(gd, {'yaxis.ticklen': 30});
26852679
})
26862680
.then(function() {
@@ -2689,17 +2683,15 @@ describe('Test axes', function() {
26892683
expect(size.r).toBe(previousSize.r);
26902684
expect(size.b).toBe(previousSize.b);
26912685
expect(size.t).toBe(previousSize.t);
2692-
})
2693-
.then(function() {
2694-
previousSize = Lib.extendDeep({}, gd._fullLayout._size);
2686+
2687+
previousSize = Lib.extendDeep({}, size);
26952688
return Plotly.relayout(gd, {'yaxis.titlefont.size': 30});
26962689
})
26972690
.then(function() {
26982691
var size = gd._fullLayout._size;
26992692
expect(size).toEqual(previousSize);
2700-
})
2701-
.then(function() {
2702-
previousSize = Lib.extendDeep({}, gd._fullLayout._size);
2693+
2694+
previousSize = Lib.extendDeep({}, size);
27032695
return Plotly.relayout(gd, {'yaxis.title': 'hello'});
27042696
})
27052697
.then(function() {
@@ -2708,42 +2700,38 @@ describe('Test axes', function() {
27082700
expect(size.r).toBe(previousSize.r);
27092701
expect(size.b).toBe(previousSize.b);
27102702
expect(size.t).toBe(previousSize.t);
2711-
})
2712-
.then(function() {
2713-
previousSize = Lib.extendDeep({}, gd._fullLayout._size);
2714-
return Plotly.relayout(gd, { 'yaxis.anchor': 'free' });
2703+
2704+
previousSize = Lib.extendDeep({}, size);
2705+
return Plotly.relayout(gd, {'yaxis.anchor': 'free'});
27152706
})
27162707
.then(function() {
27172708
var size = gd._fullLayout._size;
27182709
expect(size.l).toBe(previousSize.l);
27192710
expect(size.r).toBe(previousSize.r);
27202711
expect(size.b).toBe(previousSize.b);
27212712
expect(size.t).toBe(previousSize.t);
2722-
})
2723-
.then(function() {
2724-
previousSize = Lib.extendDeep({}, gd._fullLayout._size);
2725-
return Plotly.relayout(gd, { 'yaxis.position': 0.1});
2713+
2714+
previousSize = Lib.extendDeep({}, size);
2715+
return Plotly.relayout(gd, {'yaxis.position': 0.1});
27262716
})
27272717
.then(function() {
27282718
var size = gd._fullLayout._size;
27292719
expect(size.l).toBeLessThan(previousSize.l, 'axis moved right');
27302720
expect(size.r).toBe(previousSize.r);
27312721
expect(size.b).toBe(previousSize.b);
27322722
expect(size.t).toBe(previousSize.t);
2733-
})
2734-
.then(function() {
2735-
previousSize = Lib.extendDeep({}, gd._fullLayout._size);
2736-
return Plotly.relayout(gd, { 'yaxis.anchor': 'x' });
2723+
2724+
previousSize = Lib.extendDeep({}, size);
2725+
return Plotly.relayout(gd, {'yaxis.anchor': 'x'});
27372726
})
27382727
.then(function() {
27392728
var size = gd._fullLayout._size;
27402729
expect(size.l).toBeGreaterThan(previousSize.l, 'axis snapped back');
27412730
expect(size.r).toBe(previousSize.r);
27422731
expect(size.b).toBe(previousSize.b);
27432732
expect(size.t).toBe(previousSize.t);
2744-
})
2745-
.then(function() {
2746-
previousSize = Lib.extendDeep({}, gd._fullLayout._size);
2733+
2734+
previousSize = Lib.extendDeep({}, size);
27472735
return Plotly.relayout(gd, {
27482736
'yaxis.side': 'right',
27492737
'xaxis.side': 'top'
@@ -2756,8 +2744,7 @@ describe('Test axes', function() {
27562744
expect(size.r).toBe(previousSize.l);
27572745
expect(size.b).toBe(initialSize.b);
27582746
expect(size.t).toBe(previousSize.b);
2759-
})
2760-
.then(function() {
2747+
27612748
return Plotly.relayout(gd, {
27622749
'xaxis.automargin': false,
27632750
'yaxis.automargin': false

‎test/jasmine/tests/range_selector_test.js

+16-13
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ var Lib = require('@src/lib');
77
var Color = require('@src/components/color');
88
var createGraphDiv = require('../assets/create_graph_div');
99
var destroyGraphDiv = require('../assets/destroy_graph_div');
10+
var failTest = require('../assets/fail_test');
1011
var getRectCenter = require('../assets/get_rect_center');
1112
var mouseEvent = require('../assets/mouse_event');
1213
var setConvert = require('@src/plots/cartesian/set_convert');
@@ -461,7 +462,9 @@ describe('range selector interactions:', function() {
461462
gd = createGraphDiv();
462463
mockCopy = Lib.extendDeep({}, mock);
463464

464-
Plotly.plot(gd, mockCopy.data, mockCopy.layout).then(done);
465+
Plotly.plot(gd, mockCopy.data, mockCopy.layout)
466+
.catch(failTest)
467+
.then(done);
465468
});
466469

467470
afterEach(destroyGraphDiv);
@@ -495,9 +498,9 @@ describe('range selector interactions:', function() {
495498
Plotly.relayout(gd, 'xaxis.rangeselector.visible', false).then(function() {
496499
assertNodeCount('.rangeselector', 0);
497500
assertNodeCount('.button', 0);
498-
done();
499-
});
500-
501+
})
502+
.catch(failTest)
503+
.then(done);
501504
});
502505

503506
it('should be able to remove button(s) on `relayout`', function(done) {
@@ -511,9 +514,9 @@ describe('range selector interactions:', function() {
511514
return Plotly.relayout(gd, 'xaxis.rangeselector.buttons[1]', 'remove');
512515
}).then(function() {
513516
assertNodeCount('.button', len - 2);
514-
515-
done();
516-
});
517+
})
518+
.catch(failTest)
519+
.then(done);
517520
});
518521

519522
it('should be able to change its style on `relayout`', function(done) {
@@ -527,9 +530,9 @@ describe('range selector interactions:', function() {
527530
return Plotly.relayout(gd, prefix + 'activecolor', 'blue');
528531
}).then(function() {
529532
checkButtonColor('rgb(255, 0, 0)', 'rgb(0, 0, 255)');
530-
531-
done();
532-
});
533+
})
534+
.catch(failTest)
535+
.then(done);
533536
});
534537

535538
it('should update range and active button when clicked', function() {
@@ -589,8 +592,8 @@ describe('range selector interactions:', function() {
589592

590593
// 'all' should be after an autoscale
591594
checkActiveButton(buttons.size() - 1, 'back to all');
592-
593-
done();
594-
});
595+
})
596+
.catch(failTest)
597+
.then(done);
595598
});
596599
});

‎test/jasmine/tests/updatemenus_test.js

+19-17
Original file line numberDiff line numberDiff line change
@@ -343,23 +343,29 @@ describe('update menus interactions', function() {
343343
destroyGraphDiv();
344344
});
345345

346+
function assertPushMargins(specs) {
347+
specs.forEach(function(val, i) {
348+
var push = gd._fullLayout._pushmargin['updatemenu-' + i];
349+
if(val) expect(push).toBeDefined(i);
350+
else expect(push).toBeUndefined(i);
351+
});
352+
}
353+
346354
it('should draw only visible menus', function(done) {
347355
var initialUM1 = Lib.extendDeep({}, gd.layout.updatemenus[1]);
348356
assertMenus([0, 0]);
349-
expect(gd._fullLayout._pushmargin['updatemenu-0']).toBeDefined();
350-
expect(gd._fullLayout._pushmargin['updatemenu-1']).toBeDefined();
357+
assertPushMargins([true, true]);
351358

352-
Plotly.relayout(gd, 'updatemenus[0].visible', false).then(function() {
359+
Plotly.relayout(gd, 'updatemenus[0].visible', false)
360+
.then(function() {
353361
assertMenus([0]);
354-
expect(gd._fullLayout._pushmargin['updatemenu-0']).toBeUndefined();
355-
expect(gd._fullLayout._pushmargin['updatemenu-1']).toBeDefined();
362+
assertPushMargins([false, true]);
356363

357364
return Plotly.relayout(gd, 'updatemenus[1]', null);
358365
})
359366
.then(function() {
360367
assertNodeCount('.' + constants.containerClassName, 0);
361-
expect(gd._fullLayout._pushmargin['updatemenu-0']).toBeUndefined();
362-
expect(gd._fullLayout._pushmargin['updatemenu-1']).toBeUndefined();
368+
assertPushMargins([false, false]);
363369

364370
return Plotly.relayout(gd, {
365371
'updatemenus[0].visible': true,
@@ -368,8 +374,7 @@ describe('update menus interactions', function() {
368374
})
369375
.then(function() {
370376
assertMenus([0, 0]);
371-
expect(gd._fullLayout._pushmargin['updatemenu-0']).toBeDefined();
372-
expect(gd._fullLayout._pushmargin['updatemenu-1']).toBeDefined();
377+
assertPushMargins([true, true]);
373378

374379
return Plotly.relayout(gd, {
375380
'updatemenus[0].visible': false,
@@ -378,8 +383,7 @@ describe('update menus interactions', function() {
378383
})
379384
.then(function() {
380385
assertNodeCount('.' + constants.containerClassName, 0);
381-
expect(gd._fullLayout._pushmargin['updatemenu-0']).toBeUndefined();
382-
expect(gd._fullLayout._pushmargin['updatemenu-1']).toBeUndefined();
386+
assertPushMargins([false, false]);
383387

384388
return Plotly.relayout(gd, {
385389
'updatemenus[2]': {
@@ -392,29 +396,27 @@ describe('update menus interactions', function() {
392396
})
393397
.then(function() {
394398
assertMenus([0]);
395-
expect(gd._fullLayout._pushmargin['updatemenu-0']).toBeUndefined();
396-
expect(gd._fullLayout._pushmargin['updatemenu-1']).toBeUndefined();
397-
expect(gd._fullLayout._pushmargin['updatemenu-2']).toBeDefined();
399+
assertPushMargins([false, false, true]);
398400

399401
return Plotly.relayout(gd, 'updatemenus[0].visible', true);
400402
})
401403
.then(function() {
402404
assertMenus([0, 0]);
403-
expect(gd._fullLayout._pushmargin['updatemenu-0']).toBeDefined();
404-
expect(gd._fullLayout._pushmargin['updatemenu-1']).toBeUndefined();
405-
expect(gd._fullLayout._pushmargin['updatemenu-2']).toBeDefined();
405+
assertPushMargins([true, false, true]);
406406
expect(gd.layout.updatemenus.length).toEqual(3);
407407

408408
return Plotly.relayout(gd, 'updatemenus[0]', null);
409409
})
410410
.then(function() {
411411
assertMenus([0]);
412412
expect(gd.layout.updatemenus.length).toEqual(2);
413+
assertPushMargins([false, true, false]);
413414

414415
return Plotly.relayout(gd, 'updatemenus', null);
415416
})
416417
.then(function() {
417418
expect(gd.layout.updatemenus).toBeUndefined();
419+
assertPushMargins([false, false, false]);
418420

419421
})
420422
.then(done);

0 commit comments

Comments
 (0)