use mathjax_test file for both v2 and v3

Author: archmoj

.circleci/test.sh

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

test/jasmine/bundle_tests/mathjax_v3_test.js renamed to test/jasmine/bundle_tests/mathjax_test.js

@@ -5,17 +5,24 @@ var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
 var loadScript = require('../assets/load_script');
 
-// TODO: find a better way reuse the code from mathjav v2 tests
-//
-//
-// Now with the mathjax_config no longer needed,
-// it might be nice to move these tests in the "regular" test
-// suites, but to do that we'll need to find a way to remove MathJax from
-// page without breaking things downstream.
-
-describe('Test MathJax v3:', function() {
+// eslint-disable-next-line no-undef
+var mathjaxVersion = __karma__.config.mathjaxVersion;
+
+describe('Test MathJax v' + mathjaxVersion + ':', function() {
     beforeAll(function(done) {
-        loadScript('/base/node_modules/mathjax-v3/es5/tex-svg.js', done);
+        var src = mathjaxVersion === 3 ?
+            '/base/node_modules/mathjax-v3/es5/tex-svg.js' :
+            '/base/node_modules/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG';
+
+        // N.B. we have to load MathJax "dynamically" as Karma
+        // does not undefined the MathJax's `?config=` parameter.
+        //
+        // Now with the mathjax_config no longer needed,
+        // it might be nice to move these tests in the "regular" test
+        // suites, but to do that we'll need to find a way to remove MathJax from
+        // page without breaking things downstream.
+
+        loadScript(src, done);
     });
 
     describe('Test axis title scoot:', function() {

test/jasmine/bundle_tests/mathjax_v2_test.js

@@ -9,6 +9,7 @@ var isCI = Boolean(process.env.CI);
 var argv = minimist(process.argv.slice(4), {
     string: ['bundleTest', 'width', 'height'],
     'boolean': [
+        'mathjax3',
         'info',
         'nowatch', 'randomize',
         'failFast', 'doNotFailOnEmptyTestSuite',
@@ -60,6 +61,7 @@ if(argv.info) {
         '',
         'Other options:',
         '  - `--info`: show this info message',
+        '  - `--mathjax3`: to load mathjax v3 in relevant test',
         '  - `--Chrome` (alias `--chrome`): run test in (our custom) Chrome browser',
         '  - `--Firefox` (alias `--FF`, `--firefox`): run test in (our custom) Firefox browser',
         '  - `--IE11` (alias -- `ie11`)`: run test in IE11 browser',
@@ -287,6 +289,8 @@ func.defaultConfig = {
         tagPrefix: '@',
         skipTags: isCI ? 'noCI' : null,
 
+        mathjaxVersion: argv.mathjax3 ? 3 : 2,
+
         // See https://jasmine.github.io/api/3.4/Configuration.html
         jasmine: {
             random: argv.randomize,