update jasmine tests for mathjax v3/v4

Author: emilykl

test/jasmine/bundle_tests/mathjax_config_test.js

@@ -16,46 +16,28 @@ describe('Test MathJax v' + mathjaxVersion + ' config test:', function() {
     beforeAll(function(done) {
         gd = createGraphDiv();
 
-        if(mathjaxVersion === 3) {
-            window.MathJax = {
-                startup: {
-                    output: 'chtml',
-                    tex: {
-                        inlineMath: [['|', '|']]
-                    }
+        window.MathJax = {
+            startup: {
+                output: 'chtml',
+                tex: {
+                    inlineMath: [['|', '|']]
                 }
-            };
-        }
+            }
+        };
 
-        var src = mathjaxVersion === 3 ?
+        const src = mathjaxVersion === 3 ?
             '/base/node_modules/@plotly/mathjax-v3/es5/tex-svg.js' :
-            '/base/node_modules/@plotly/mathjax-v2/MathJax.js?config=TeX-AMS_SVG';
+            '/base/node_modules/@plotly/mathjax-v4/tex-svg.js';
 
         loadScript(src, done);
     });
 
     afterAll(destroyGraphDiv);
 
     it('should maintain startup renderer & inlineMath after SVG rendering', function(done) {
-        if(mathjaxVersion === 2) {
-            window.MathJax.Hub.Config({
-                tex2jax: {
-                    inlineMath: [['|', '|']]
-                }
-            });
-
-            window.MathJax.Hub.setRenderer('CHTML');
-        }
-
         // before plot
-        if(mathjaxVersion === 3) {
-            expect(window.MathJax.config.startup.output).toEqual('chtml');
-            expect(window.MathJax.config.startup.tex.inlineMath).toEqual([['|', '|']]);
-        }
-        if(mathjaxVersion === 2) {
-            expect(window.MathJax.Hub.config.menuSettings.renderer).toEqual('');
-            expect(window.MathJax.Hub.config.tex2jax.inlineMath).toEqual([['|', '|']]);
-        }
+        expect(window.MathJax.config.startup.output).toEqual('chtml');
+        expect(window.MathJax.config.startup.tex.inlineMath).toEqual([['|', '|']]);
 
         Plotly.newPlot(gd, {
             data: [{
@@ -69,19 +51,8 @@ describe('Test MathJax v' + mathjaxVersion + ' config test:', function() {
         })
         .then(function() {
             // after plot
-            if(mathjaxVersion === 3) {
-                expect(window.MathJax.config.startup.output).toEqual('chtml');
-                expect(window.MathJax.config.startup.tex.inlineMath).toEqual([['|', '|']]);
-            }
-            if(mathjaxVersion === 2) {
-                expect(window.MathJax.Hub.config.menuSettings.renderer).toEqual('');
-            }
-        })
-        .then(delay(1000)) // TODO: why we need this delay for mathjax v2 here?
-        .then(function() {
-            if(mathjaxVersion === 2) {
-                expect(window.MathJax.Hub.config.tex2jax.inlineMath).toEqual([['|', '|']]);
-            }
+            expect(window.MathJax.config.startup.output).toEqual('chtml');
+            expect(window.MathJax.config.startup.tex.inlineMath).toEqual([['|', '|']]);
         })
         .then(done, done.fail);
     });

test/jasmine/bundle_tests/mathjax_test.js

@@ -10,10 +10,13 @@ var mathjaxVersion = __karma__.config.mathjaxVersion;
 
 describe('Test MathJax v' + mathjaxVersion + ':', function() {
     beforeAll(function(done) {
-        var src = mathjaxVersion === 3 ?
+        const src = mathjaxVersion === 3 ?
             '/base/node_modules/@plotly/mathjax-v3/es5/tex-svg.js' :
-            '/base/node_modules/@plotly/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG';
+            '/base/node_modules/@plotly/mathjax-v4/tex-svg.js';
 
+        // TODO: `?config=` is not needed for MathJax v3 and onward,
+        // should we adjust these tests?
+        
         // N.B. we have to load MathJax "dynamically" as Karma
         // does not undefined the MathJax's `?config=` parameter.
         //

test/jasmine/karma.conf.js

@@ -69,7 +69,7 @@ if (argv.info) {
             '',
             'Other options:',
             '  - `--info`: show this info message',
-            '  - `--mathjax3`: to load mathjax v3 in relevant test',
+            '  - `--mathjax3`: to load mathjax v3 in relevant test (otherwise mathjax v4 is loaded)',
             '  - `--Chrome` (alias `--chrome`): run test in (our custom) Chrome browser',
             '  - `--Firefox` (alias `--FF`, `--firefox`): run test in (our custom) Firefox browser',
             '  - `--nowatch (dflt: `false`, `true` on CI)`: run karma w/o `autoWatch` / multiple run mode',
@@ -128,8 +128,8 @@ if (isFullSuite) {
 
 var pathToCustomMatchers = path.join(__dirname, 'assets', 'custom_matchers.js');
 var pathToTopojsonDist = path.join(__dirname, '..', '..', 'topojson', 'dist');
-var pathToMathJax2 = path.join(__dirname, '..', '..', 'node_modules', '@plotly/mathjax-v2');
 var pathToMathJax3 = path.join(__dirname, '..', '..', 'node_modules', '@plotly/mathjax-v3');
+var pathToMathJax4 = path.join(__dirname, '..', '..', 'node_modules', '@plotly/mathjax-v4');
 var pathToVirtualWebgl = path.join(__dirname, '..', '..', 'node_modules', 'virtual-webgl', 'src', 'virtual-webgl.js');
 
 var reporters = [];
@@ -200,10 +200,10 @@ func.defaultConfig = {
     // N.B. the rest of this field is filled below
     files: [
         pathToCustomMatchers,
-        // available to fetch from /base/node_modules/@plotly/mathjax-v2/
+        // available to fetch from /base/node_modules/@plotly/mathjax-v3/
         // more info: http://karma-runner.github.io/3.0/config/files.html
-        { pattern: pathToMathJax2 + '/**', included: false, watched: false, served: true },
         { pattern: pathToMathJax3 + '/**', included: false, watched: false, served: true },
+        { pattern: pathToMathJax4 + '/**', included: false, watched: false, served: true },
         { pattern: pathToTopojsonDist + '/**', included: false, watched: false, served: true }
     ],
 
@@ -308,7 +308,7 @@ func.defaultConfig = {
         tagPrefix: '@',
         skipTags: isCI ? 'noCI' : null,
 
-        mathjaxVersion: argv.mathjax3 ? 3 : 2,
+        mathjaxVersion: argv.mathjax3 ? 3 : 4,
 
         // See https://jasmine.github.io/api/3.4/Configuration.html
         jasmine: {