Skip to content

using a more recent nodejs v12 and Chrome verisions on the CircleCI #5604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 8, 2021
Merged

using a more recent nodejs v12 and Chrome verisions on the CircleCI #5604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b25a457
using nodejs v12.16.2 on the CircleCI
archmoj Apr 21, 2021
e14153b
Merge remote-tracking branch 'origin/master' into more-recent-nodejs-12
archmoj May 6, 2021
fcfbf0c
use node v12.22.1 on CircleCI
archmoj May 6, 2021
e6e7caa
adjust shape test for precision errors
archmoj May 6, 2021
7923e59
move mathjax firefox test to noci test
archmoj May 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version: 2.0
jobs:
install-and-cibuild:
docker:
- image: circleci/node:12.13.0
- image: circleci/node:12.22.1
working_directory: ~/plotly.js
steps:
- checkout
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
no-gl-jasmine:
docker:
# need '-browsers' version to test in real (xvfb-wrapped) browsers
- image: circleci/node:12.13.0-browsers
- image: circleci/node:12.22.1-browsers
parallelism: 8
working_directory: ~/plotly.js
steps:
Expand All @@ -56,7 +56,7 @@ jobs:
webgl-jasmine:
docker:
# need '-browsers' version to test in real (xvfb-wrapped) browsers
- image: circleci/node:12.13.0-browsers
- image: circleci/node:12.22.1-browsers
parallelism: 8
working_directory: ~/plotly.js
steps:
Expand All @@ -69,7 +69,7 @@ jobs:
no-gl-flaky-jasmine:
docker:
# need '-browsers' version to test in real (xvfb-wrapped) browsers
- image: circleci/node:12.13.0-browsers
- image: circleci/node:12.22.1-browsers
working_directory: ~/plotly.js
steps:
- attach_workspace:
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:

source-syntax:
docker:
- image: circleci/node:12.13.0
- image: circleci/node:12.22.1
working_directory: ~/plotly.js
steps:
- attach_workspace:
Expand All @@ -131,7 +131,7 @@ jobs:
jasmine-bundle:
docker:
# need '-browsers' version to test in real (xvfb-wrapped) browsers
- image: circleci/node:12.13.0-browsers
- image: circleci/node:12.22.1-browsers
working_directory: ~/plotly.js
steps:
- attach_workspace:
Expand All @@ -142,7 +142,7 @@ jobs:

publish-dist:
docker:
- image: circleci/node:12.13.0
- image: circleci/node:12.22.1
working_directory: ~/plotly.js
steps:
- attach_workspace:
Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:

test-dist1:
docker:
- image: circleci/node:12.13.0
- image: circleci/node:12.22.1
working_directory: ~/plotly.js
steps:
- attach_workspace:
Expand All @@ -197,7 +197,7 @@ jobs:

test-dist2:
docker:
- image: circleci/node:12.13.0
- image: circleci/node:12.22.1
working_directory: ~/plotly.js
steps:
- attach_workspace:
Expand Down
3 changes: 3 additions & 0 deletions tasks/noci_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ root=$(dirname $0)/..

# jasmine specs with @noCI tag
test_jasmine () {
# run MathJax on FireFox
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --nowatch && \
# run noCI tests
npm run test-jasmine -- --tags=noCI,noCIdep --nowatch || EXIT_STATE=$?
}

Expand Down
17 changes: 0 additions & 17 deletions tasks/test_bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,6 @@ glob(pathToJasmineBundleTests + '/*.js', function(err, files) {
};
});

var mathjaxTestFirefox = function(cb) {
var cmd = [
'karma', 'start',
path.join(constants.pathToRoot, 'test', 'jasmine', 'karma.conf.js'),
'--FF',
'--bundleTest=mathjax',
'--nowatch'
].join(' ');

console.log('Running: ' + cmd);

exec(cmd, function(err) {
cb(null, err);
}).stdout.pipe(process.stdout);
};
tasks.push(mathjaxTestFirefox);

runSeries(tasks, function(err, results) {
if(err) throw err;

Expand Down
4 changes: 2 additions & 2 deletions test/jasmine/tests/shapes_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,8 +1124,8 @@ describe('A fixed size shape', function() {
var shapeNodeAfterDrag = getFirstShapeNode();
var bBoxAfterDrag = shapeNodeAfterDrag.getBoundingClientRect();
var resizeFactor = shallShrink ? -1 : 1;
expect(bBoxAfterDrag.height).toBe(bBoxBeforeDrag.height + resizeFactor * Math.abs(dy));
expect(bBoxAfterDrag.width).toBe(bBoxBeforeDrag.width + resizeFactor * Math.abs(dx));
expect(bBoxAfterDrag.height).toBeCloseTo(bBoxBeforeDrag.height + resizeFactor * Math.abs(dy));
expect(bBoxAfterDrag.width).toBeCloseTo(bBoxBeforeDrag.width + resizeFactor * Math.abs(dx));
assertShapeFullyVisible(shapeNodeAfterDrag);
})
.then(done, done.fail);
Expand Down