Merge pull request #5604 from plotly/more-recent-nodejs-12

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

Author: archmoj

.circleci/config.yml

@@ -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
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:

tasks/noci_test.sh

@@ -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=$?
 }
 

tasks/test_bundle.js

@@ -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;
 

test/jasmine/tests/shapes_test.js

@@ -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);