Merge remote-tracking branch 'upstream/master' into patch-2

Author: Domino987

.circleci/config.yml

@@ -31,10 +31,42 @@ jobs:
           paths:
             - plotly.js
 
+  timezone-jasmine:
+    docker:
+      # need '-browsers' version to test in real (xvfb-wrapped) browsers
+      - image: circleci/node:12.22.1-browsers
+    working_directory: ~/plotly.js
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Run hover_label test in UTC timezone
+          environment:
+            TZ: "UTC"
+          command: date && npm run test-jasmine hover_label
+      - run:
+          name: Run hover_label test in Europe/Berlin timezone
+          environment:
+            TZ: "Europe/Berlin"
+          command: date && npm run test-jasmine hover_label
+      - run:
+          name: Run hover_label test in Asia/Tokyo timezone
+          environment:
+            TZ: "Asia/Tokyo"
+          command: date && npm run test-jasmine hover_label
+      - run:
+          name: Run hover_label test in America/Toronto timezone
+          environment:
+            TZ: "America/Toronto"
+          command: date && npm run test-jasmine hover_label
+
   no-gl-jasmine:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
       - image: circleci/node:12.22.1-browsers
+    environment:
+      # Alaska time (arbitrary timezone to test date logic)
+      TZ: "America/Anchorage"
     parallelism: 8
     working_directory: ~/plotly.js
     steps:
@@ -48,6 +80,9 @@ jobs:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
       - image: circleci/node:12.22.1-browsers
+    environment:
+      # Alaska time (arbitrary timezone to test date logic)
+      TZ: "America/Anchorage"
     parallelism: 8
     working_directory: ~/plotly.js
     steps:
@@ -61,6 +96,9 @@ jobs:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
       - image: circleci/node:12.22.1-browsers
+    environment:
+      # Alaska time (arbitrary timezone to test date logic)
+      TZ: "America/Anchorage"
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
@@ -69,6 +107,21 @@ jobs:
           name: Run jasmine tests (part C)
           command: .circleci/test.sh flaky-no-gl-jasmine
 
+  bundle-jasmine:
+    docker:
+      # need '-browsers' version to test in real (xvfb-wrapped) browsers
+      - image: circleci/node:12.22.1-browsers
+    environment:
+      # Alaska time (arbitrary timezone to test date logic)
+      TZ: "America/Anchorage"
+    working_directory: ~/plotly.js
+    steps:
+      - attach_workspace:
+          at: ~/
+      - run:
+          name: Run jasmine tests (part D)
+          command: .circleci/test.sh bundle-jasmine
+
   make-baselines:
     parallelism: 4
     docker:
@@ -162,18 +215,6 @@ jobs:
           name: Run syntax tests on source files
           command: .circleci/test.sh source-syntax
 
-  jasmine-bundle:
-    docker:
-      # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: circleci/node:12.22.1-browsers
-    working_directory: ~/plotly.js
-    steps:
-      - attach_workspace:
-          at: ~/
-      - run:
-          name: Run jasmine tests (part D)
-          command: .circleci/test.sh jasmine-bundle
-
   publish-dist:
     docker:
       - image: circleci/node:12.22.1
@@ -234,6 +275,9 @@ jobs:
       - run:
           name: Test plotly bundles againt unexpected characters
           command: npm run no-bad-char
+      - run:
+          name: Display function constructors in plotly.js bundle
+          command: npm run log-new-func
       - run:
           name: Test certain bundles against function constructors
           command: npm run no-new-func
@@ -246,7 +290,10 @@ workflows:
   build-and-test:
     jobs:
       - install-and-cibuild
-      - jasmine-bundle:
+      - timezone-jasmine:
+          requires:
+            - install-and-cibuild
+      - bundle-jasmine:
           requires:
             - install-and-cibuild
       - no-gl-jasmine:

.circleci/test.sh

@@ -33,17 +33,9 @@ retry () {
     fi
 }
 
-# set timezone to Alaska time (arbitrary timezone to test date logic)
-set_tz () {
-    sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
-    export TZ='America/Anchorage'
-}
-
 case $1 in
 
     no-gl-jasmine)
-        set_tz
-
         SUITE=$(circleci tests glob "$ROOT/test/jasmine/tests/*" | circleci tests split)
         MAX_AUTO_RETRY=2
         retry npm run test-jasmine -- $SUITE --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
@@ -52,8 +44,6 @@ case $1 in
         ;;
 
     webgl-jasmine)
-        set_tz
-
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=5 --tag=gl | circleci tests split))
         for s in ${SHARDS[@]}; do
             MAX_AUTO_RETRY=2
@@ -64,8 +54,6 @@ case $1 in
         ;;
 
     flaky-no-gl-jasmine)
-        set_tz
-
         SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --limit=1 --tag=flaky | circleci tests split))
 
         for s in ${SHARDS[@]}; do
@@ -76,6 +64,11 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
+    bundle-jasmine)
+        npm run test-bundle || EXIT_STATE=$?
+        exit $EXIT_STATE
+        ;;
+
     make-baselines)
         SUITE=$(find $ROOT/test/image/mocks/ -type f -printf "%f\n" | sed 's/\.json$//1' | circleci tests split)
         python3 test/image/make_baseline.py $SUITE || EXIT_STATE=$?
@@ -87,12 +80,6 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
-    jasmine-bundle)
-        set_tz
-        npm run test-bundle || EXIT_STATE=$?
-        exit $EXIT_STATE
-        ;;
-
     source-syntax)
         npm run lint        || EXIT_STATE=$?
         npm run test-syntax || EXIT_STATE=$?