run mathjax v2 and v3 in the same container

Author: archmoj

.circleci/config.yml

@@ -160,7 +160,7 @@ jobs:
           name: Run jasmine tests (part D)
           command: .circleci/test.sh bundle-jasmine
 
-  mathjax-v2-firefox81:
+  mathjax-firefox81:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
       - image: cimg/node:16.8.0-browsers
@@ -176,10 +176,10 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          name: Test MathJax v2 on firefox-81
-          command: .circleci/test.sh mathjax-v2-firefox
+          name: Test MathJax on firefox-81
+          command: .circleci/test.sh mathjax-firefox
 
-  mathjax-v2-firefox82:
+  mathjax-firefox82:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
       - image: cimg/node:16.8.0-browsers
@@ -195,10 +195,10 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          name: Test MathJax v2 on firefox-82
-          command: .circleci/test.sh mathjax-v2-firefox82+
+          name: Test MathJax on firefox-82
+          command: .circleci/test.sh mathjax-firefox82+
 
-  mathjax-v2-firefoxLatest:
+  mathjax-firefoxLatest:
     docker:
       # need '-browsers' version to test in real (xvfb-wrapped) browsers
       - image: cimg/node:16.8.0-browsers
@@ -213,45 +213,8 @@ jobs:
       - attach_workspace:
           at: ~/
       - run:
-          name: Test MathJax v2 on firefox-latest
-          command: .circleci/test.sh mathjax-v2-firefox82+
-
-  mathjax-v3-firefoxLatest:
-    docker:
-      # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.8.0-browsers
-    environment:
-      # Alaska time (arbitrary timezone to test date logic)
-      TZ: "America/Anchorage"
-    working_directory: ~/plotly.js
-    steps:
-      - browser-tools/install-browser-tools: &browser-versions
-          install-chrome: false
-          install-chromedriver: false
-      - attach_workspace:
-          at: ~/
-      - run:
-          name: Test MathJax v3 on firefox-latest
-          command: .circleci/test.sh mathjax-v3-firefox82+
-
-  mathjax-v3-firefox81:
-    docker:
-      # need '-browsers' version to test in real (xvfb-wrapped) browsers
-      - image: cimg/node:16.8.0-browsers
-    environment:
-      # Alaska time (arbitrary timezone to test date logic)
-      TZ: "America/Anchorage"
-    working_directory: ~/plotly.js
-    steps:
-      - browser-tools/install-browser-tools: &browser-versions
-          firefox-version: '81.0'
-          install-chrome: false
-          install-chromedriver: false
-      - attach_workspace:
-          at: ~/
-      - run:
-          name: Test MathJax v2 on firefox-81
-          command: .circleci/test.sh mathjax-v3-firefox
+          name: Test MathJax on firefox-latest
+          command: .circleci/test.sh mathjax-firefox82+
 
   make-baselines:
     parallelism: 4
@@ -432,19 +395,13 @@ workflows:
       - bundle-jasmine:
           requires:
             - install-and-cibuild
-      - mathjax-v2-firefox81:
-          requires:
-            - install-and-cibuild
-      - mathjax-v2-firefox82:
-          requires:
-            - install-and-cibuild
-      - mathjax-v2-firefoxLatest:
+      - mathjax-firefox81:
           requires:
             - install-and-cibuild
-      - mathjax-v3-firefoxLatest:
+      - mathjax-firefox82:
           requires:
             - install-and-cibuild
-      - mathjax-v3-firefox81:
+      - mathjax-firefoxLatest:
           requires:
             - install-and-cibuild
       - no-gl-jasmine:

.circleci/test.sh

@@ -69,26 +69,17 @@ case $1 in
         exit $EXIT_STATE
         ;;
 
-    mathjax-v2-firefox)
+    mathjax-firefox)
         ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_v2 --nowatch || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
-    mathjax-v2-firefox82+)
-        ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --skip-tags=noFF82 --bundleTest=mathjax_v2 --nowatch || EXIT_STATE=$?
-        exit $EXIT_STATE
-        ;;
-
-    mathjax-v3-firefox82+)
+    mathjax-firefox82+)
+        ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --skip-tags=noFF82 --bundleTest=mathjax_v2 --nowatch &&
         ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --skip-tags=noFF82 --bundleTest=mathjax_v3 --nowatch || EXIT_STATE=$?
         exit $EXIT_STATE
         ;;
 
-    mathjax-v3-firefox)
-        ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_v3 --nowatch || 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=$?