Skip to content

Commit 4c9cd0c

Browse files
authored
Merge pull request #5602 from plotly/more-stable-ci-jasmine
Revise CI tests to have a more stable run
2 parents 6518eb7 + 2aabfd3 commit 4c9cd0c

File tree

3 files changed

+30
-6
lines changed

3 files changed

+30
-6
lines changed

.circleci/config.yml

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
docker:
4545
# need '-browsers' version to test in real (xvfb-wrapped) browsers
4646
- image: circleci/node:12.13.0-browsers
47-
parallelism: 2
47+
parallelism: 8
4848
working_directory: ~/plotly.js
4949
steps:
5050
- attach_workspace:
@@ -57,7 +57,7 @@ jobs:
5757
docker:
5858
# need '-browsers' version to test in real (xvfb-wrapped) browsers
5959
- image: circleci/node:12.13.0-browsers
60-
parallelism: 3
60+
parallelism: 8
6161
working_directory: ~/plotly.js
6262
steps:
6363
- attach_workspace:
@@ -170,6 +170,18 @@ jobs:
170170
echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/dist/plotly.js
171171
echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/dist/plotly.min.js
172172
echo https://$CIRCLE_BUILD_NUM-$PROJECT_NUM-gh.circle-artifacts.com/0/dist/plot-schema.json
173+
- persist_to_workspace:
174+
root: ~/
175+
paths:
176+
- plotly.js
177+
178+
test-dist1:
179+
docker:
180+
- image: circleci/node:12.13.0
181+
working_directory: ~/plotly.js
182+
steps:
183+
- attach_workspace:
184+
at: ~/
173185
- run:
174186
name: Test validation using node.js and jsdom
175187
command: npm run test-plain-obj
@@ -182,13 +194,19 @@ jobs:
182194
- run:
183195
name: Test certain bundles against function constructors
184196
command: npm run no-new-func
197+
198+
test-dist2:
199+
docker:
200+
- image: circleci/node:12.13.0
201+
working_directory: ~/plotly.js
202+
steps:
203+
- attach_workspace:
204+
at: ~/
185205
- run:
186206
name: Test plotly bundles against es6
187207
command: npm run no-es6-dist
188208
- run:
189209
name: Test plotly bundles againt duplicate keys
190-
environment:
191-
NODE_OPTIONS: --max_old_space_size=4096
192210
command: npm run no-dup-keys
193211

194212
workflows:
@@ -220,3 +238,9 @@ workflows:
220238
- publish-dist:
221239
requires:
222240
- install-and-cibuild
241+
- test-dist1:
242+
requires:
243+
- publish-dist
244+
- test-dist2:
245+
requires:
246+
- publish-dist

test/jasmine/tests/sankey_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@ describe('sankey tests', function() {
13181318
.then(done, done.fail);
13191319
});
13201320

1321-
it('should persist the position of every nodes after drag in attributes nodes.(x|y)', function(done) {
1321+
it('@flaky should persist the position of every nodes after drag in attributes nodes.(x|y)', function(done) {
13221322
mockCopy.data[0].arrangement = arrangement;
13231323
var move = [50, -50];
13241324
var nodes;

test/jasmine/tests/splom_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1684,7 +1684,7 @@ describe('Test splom select:', function() {
16841684
.then(done, done.fail);
16851685
});
16861686

1687-
it('@gl should redraw splom traces before scattergl trace (if any)', function(done) {
1687+
it('@noci @gl should redraw splom traces before scattergl trace (if any)', function(done) {
16881688
var fig = require('@mocks/splom_with-cartesian.json');
16891689
fig.layout.dragmode = 'select';
16901690
fig.layout.width = 400;

0 commit comments

Comments
 (0)