Skip to content

Commit 264ae72

Browse files
authored
Merge pull request #5646 from plotly/chrome-90
Adjust some noCI gl tests and run them on CircleCI
2 parents 199d9ad + 7502d90 commit 264ae72

File tree

3 files changed

+24
-28
lines changed

3 files changed

+24
-28
lines changed

.circleci/test.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ case $1 in
4545
set_tz
4646

4747
SUITE=$(circleci tests glob "$ROOT/test/jasmine/tests/*" | circleci tests split)
48-
npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
48+
MAX_AUTO_RETRY=2
49+
retry npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
4950

5051
exit $EXIT_STATE
5152
;;
@@ -55,7 +56,7 @@ case $1 in
5556

5657
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=5 --tag=gl | circleci tests split))
5758
for s in ${SHARDS[@]}; do
58-
MAX_AUTO_RETRY=1
59+
MAX_AUTO_RETRY=2
5960
retry npm run test-jasmine -- "$s" --tags=gl --skip-tags=noCI --doNotFailOnEmptyTestSuite
6061
done
6162

test/jasmine/tests/gl3d_hover_click_test.js

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ describe('Test gl3d trace click/hover:', function() {
543543
.then(done, done.fail);
544544
});
545545

546-
it('@noCI @gl should display correct face colors', function(done) {
546+
it('@gl should display correct face colors', function(done) {
547547
var fig = mesh3dcoloringMock;
548548

549549
Plotly.newPlot(gd, fig)
@@ -595,7 +595,7 @@ describe('Test gl3d trace click/hover:', function() {
595595
.then(done, done.fail);
596596
});
597597

598-
it('@noCI @gl should display correct face intensities (uniform grid)', function(done) {
598+
it('@gl should display correct face intensities (uniform grid)', function(done) {
599599
var fig = mesh3dcellIntensityMock;
600600

601601
Plotly.newPlot(gd, fig)
@@ -625,37 +625,32 @@ describe('Test gl3d trace click/hover:', function() {
625625
.then(done, done.fail);
626626
});
627627

628-
it('@noCI @gl should display correct face intensities (non-uniform grid)', function(done) {
629-
var fig = mesh3dbunnyMock;
628+
it('@gl should display correct face intensities (non-uniform grid)', function(done) {
629+
var fig = Lib.extendDeep({}, mesh3dbunnyMock);
630+
631+
fig.layout.scene.camera.eye = {
632+
x: 0,
633+
y: 0.2,
634+
z: 0.05
635+
};
630636

631637
Plotly.newPlot(gd, fig)
632638
.then(delay(20))
633-
.then(function() { mouseEvent('mouseover', 300, 200); })
634-
.then(delay(20))
635-
.then(function() {
636-
assertHoverText(
637-
'x: −0.02154988',
638-
'y: −0.1181136',
639-
'z: 0.9471037',
640-
'cell intensity: 8',
641-
'trace 0'
642-
);
643-
})
644-
.then(function() { mouseEvent('mouseover', 400, 300); })
639+
.then(function() { mouseEvent('mouseover', 300, 100); })
645640
.then(delay(20))
646641
.then(function() {
647642
assertHoverText(
648-
'x: −0.3543044',
649-
'y: 0.4389607',
650-
'z: 0.6468034',
651-
'cell intensity: 8',
643+
'x: 0.0112223',
644+
'y: −0.05352963',
645+
'z: 0.5941605',
646+
'cell intensity: 12',
652647
'trace 0'
653648
);
654649
})
655650
.then(done, done.fail);
656651
});
657652

658-
it('@noCI @gl should display correct face intensities *alpha-hull* case', function(done) {
653+
it('@gl should display correct face intensities *alpha-hull* case', function(done) {
659654
var fig = {
660655
data: [{
661656
type: 'mesh3d',
@@ -698,7 +693,7 @@ describe('Test gl3d trace click/hover:', function() {
698693
.then(done, done.fail);
699694
});
700695

701-
it('@noCI @gl should display correct face intensities *delaunay* case', function(done) {
696+
it('@gl should display correct face intensities *delaunay* case', function(done) {
702697
var fig = {
703698
data: [{
704699
type: 'mesh3d',

test/jasmine/tests/select_test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2010,7 +2010,7 @@ describe('Test select box and lasso per trace:', function() {
20102010
});
20112011

20122012
[false, true].forEach(function(hasCssTransform) {
2013-
it('@noCI @gl should work on choroplethmapbox traces, hasCssTransform: ' + hasCssTransform, function(done) {
2013+
it('@gl should work on choroplethmapbox traces, hasCssTransform: ' + hasCssTransform, function(done) {
20142014
var assertPoints = makeAssertPoints(['location', 'z']);
20152015
var assertRanges = makeAssertRanges('mapbox');
20162016
var assertLassoPoints = makeAssertLassoPoints('mapbox');
@@ -2034,7 +2034,7 @@ describe('Test select box and lasso per trace:', function() {
20342034
[[150, 150], [300, 300]],
20352035
function() {
20362036
assertPoints([['NY', 10]]);
2037-
assertRanges([[-83.29, 46.13], [-73.97, 39.29]]);
2037+
assertRanges([[-83.38, 46.13], [-74.06, 39.29]]);
20382038
assertSelectedPoints({0: [0]});
20392039
},
20402040
null, BOXEVENTS, 'choroplethmapbox select'
@@ -2050,8 +2050,8 @@ describe('Test select box and lasso per trace:', function() {
20502050
assertPoints([['MA', 20]]);
20512051
assertSelectedPoints({0: [1]});
20522052
assertLassoPoints([
2053-
[-73.97, 43.936], [-73.97, 39.293], [-67.756, 39.293],
2054-
[-67.756, 43.936], [-73.971, 43.936]
2053+
[-74.06, 43.936], [-74.06, 39.293], [-67.84, 39.293],
2054+
[-67.84, 43.936], [-74.06, 43.936]
20552055
]);
20562056
},
20572057
null, LASSOEVENTS, 'choroplethmapbox lasso'

0 commit comments

Comments
 (0)