Skip to content

Commit 55fca52

Browse files
authored
Merge pull request #7459 from plotly/brace-expansion-2.0.2
chore: Bump `brace-expansion` 2.0.2 and adjust noCI test to pass on GH workflow
2 parents e2fd2bb + 4b39fec commit 55fca52

File tree

4 files changed

+23
-29
lines changed

4 files changed

+23
-29
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- run: npm run pretest
2828
- run: npm ci
2929
- run: npm run cibuild
30-
- name: Run headless test
30+
- name: Run noCI tests
3131
uses: coactions/setup-xvfb@v1
3232
with:
3333
run: ./tasks/noci_test.sh jasmine

package-lock.json

Lines changed: 16 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/jasmine/karma.conf.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@ var hasSpecReporter = reporters.indexOf('spec') !== -1;
145145
if(!hasSpecReporter && argv.showSkipped) reporters.push('spec');
146146
if(argv.verbose) reporters.push('verbose');
147147

148+
if(process.argv.indexOf('--tags=noCI,noCIdep') !== -1) {
149+
reporters = ['dots'];
150+
}
151+
148152
function func(config) {
149153
// level of logging
150154
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG

test/jasmine/tests/select_test.js

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2641,8 +2641,6 @@ describe('Test select box and lasso per trace:', function() {
26412641
it('@noCI should work for waterfall traces, hasCssTransform: ' + hasCssTransform, function(done) {
26422642
var assertPoints = makeAssertPoints(['curveNumber', 'x', 'y']);
26432643
var assertSelectedPoints = makeAssertSelectedPoints();
2644-
var assertRanges = makeAssertRanges();
2645-
var assertLassoPoints = makeAssertLassoPoints();
26462644

26472645
var fig = Lib.extendDeep({}, require('../../image/mocks/waterfall_profit-loss_2018_positive-negative'));
26482646
fig.layout.dragmode = 'lasso';
@@ -2657,14 +2655,11 @@ describe('Test select box and lasso per trace:', function() {
26572655
function() {
26582656
assertPoints([
26592657
[0, 281, 'Purchases'],
2660-
[0, 269, 'Material expenses'], ]);
2658+
[0, 269, 'Material expenses'],
2659+
]);
26612660
assertSelectedPoints({
26622661
0: [5, 6]
26632662
});
2664-
assertLassoPoints([
2665-
[289.8550, 57.9710 ,521.7391, 405.7971],
2666-
[4.3387, 6.7580, 6.7580, 5.5483]
2667-
]);
26682663
},
26692664
null, [3, 2, 1], 'waterfall lasso'
26702665
);
@@ -2683,10 +2678,6 @@ describe('Test select box and lasso per trace:', function() {
26832678
assertSelectedPoints({
26842679
0: [5, 6]
26852680
});
2686-
assertRanges([
2687-
[173.9130, 289.8550],
2688-
[4.3387, 6.7580]
2689-
]);
26902681
},
26912682
null, BOXEVENTS, 'waterfall select'
26922683
);
@@ -2699,7 +2690,6 @@ describe('Test select box and lasso per trace:', function() {
26992690
it('@noCI should work for funnel traces, hasCssTransform: ' + hasCssTransform, function(done) {
27002691
var assertPoints = makeAssertPoints(['curveNumber', 'x', 'y']);
27012692
var assertSelectedPoints = makeAssertSelectedPoints();
2702-
var assertLassoPoints = makeAssertLassoPoints();
27032693

27042694
var fig = Lib.extendDeep({}, require('../../image/mocks/funnel_horizontal_group_basic'));
27052695
fig.layout.dragmode = 'lasso';
@@ -2720,10 +2710,6 @@ describe('Test select box and lasso per trace:', function() {
27202710
0: [2],
27212711
1: [1]
27222712
});
2723-
assertLassoPoints([
2724-
[-140.1492, -1697.3631, 1417.0646, 638.4577],
2725-
[1.1129, 1.9193 , 1.9193, 1.5161]
2726-
]);
27272713
},
27282714
null, [3, 2, 1], 'funnel lasso'
27292715
);

0 commit comments

Comments
 (0)