From ca3672c5d021b8c9eef7d936e347b22cece3db69 Mon Sep 17 00:00:00 2001 From: Piotr Jasiun Date: Fri, 13 Feb 2015 12:24:53 +0100 Subject: [PATCH 1/4] Added bender.config.mathJaxLibPath to tests so it is possible to use local MJ. --- tests/plugins/mathjax/frameWrapper.js | 2 +- tests/plugins/mathjax/mathjax.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/plugins/mathjax/frameWrapper.js b/tests/plugins/mathjax/frameWrapper.js index 18d2fa0c6c9..c9de5cb6fcd 100644 --- a/tests/plugins/mathjax/frameWrapper.js +++ b/tests/plugins/mathjax/frameWrapper.js @@ -17,7 +17,7 @@ doc = iFrame.getFrameDocument(), fakeEditor = { config: { - mathJaxLib: 'http://cdn.mathjax.org/mathjax/2.2-latest/MathJax.js?config=TeX-AMS_HTML' + mathJaxLib: bender.config.mathJaxLibPath || 'http://cdn.mathjax.org/mathjax/2.2-latest/MathJax.js?config=TeX-AMS_HTML' }, fire: function() { //mock diff --git a/tests/plugins/mathjax/mathjax.js b/tests/plugins/mathjax/mathjax.js index 75944b34049..42847503918 100644 --- a/tests/plugins/mathjax/mathjax.js +++ b/tests/plugins/mathjax/mathjax.js @@ -6,7 +6,7 @@ CKEDITOR.disableAutoInline = true; - var mathJaxLib = 'http://cdn.mathjax.org/mathjax/2.2-latest/MathJax.js?config=TeX-AMS_HTML'; + var mathJaxLib = bender.config.mathJaxLibPath || 'http://cdn.mathjax.org/mathjax/2.2-latest/MathJax.js?config=TeX-AMS_HTML'; var editor; From 0652640b821c08bf2246cd17eedb4c3f36240074 Mon Sep 17 00:00:00 2001 From: Piotr Jasiun Date: Wed, 18 Feb 2015 15:41:01 +0100 Subject: [PATCH 2/4] Removed MathJax CDN from tests. --- tests/plugins/mathjax/frameWrapper.js | 2 +- tests/plugins/mathjax/mathjax.js | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/plugins/mathjax/frameWrapper.js b/tests/plugins/mathjax/frameWrapper.js index c9de5cb6fcd..ab95fc0a3fa 100644 --- a/tests/plugins/mathjax/frameWrapper.js +++ b/tests/plugins/mathjax/frameWrapper.js @@ -17,7 +17,7 @@ doc = iFrame.getFrameDocument(), fakeEditor = { config: { - mathJaxLib: bender.config.mathJaxLibPath || 'http://cdn.mathjax.org/mathjax/2.2-latest/MathJax.js?config=TeX-AMS_HTML' + mathJaxLib: '' }, fire: function() { //mock diff --git a/tests/plugins/mathjax/mathjax.js b/tests/plugins/mathjax/mathjax.js index 42847503918..31d12996732 100644 --- a/tests/plugins/mathjax/mathjax.js +++ b/tests/plugins/mathjax/mathjax.js @@ -6,7 +6,7 @@ CKEDITOR.disableAutoInline = true; - var mathJaxLib = bender.config.mathJaxLibPath || 'http://cdn.mathjax.org/mathjax/2.2-latest/MathJax.js?config=TeX-AMS_HTML'; + var mathJaxLib = bender.config.mathJaxLibPath; var editor; @@ -47,8 +47,12 @@ }, 'async:init': function() { - if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) + if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) { assert.ignore(); + } + + assert.isString( mathJaxLib, + 'bender.config.mathJaxLibPath should be defined with the path to MathJax lib used for testing.' ); var tc = this; From af9f54b416b5bee915d962fdcdd5170709f6dcbd Mon Sep 17 00:00:00 2001 From: Piotr Jasiun Date: Mon, 2 Mar 2015 11:36:31 +0100 Subject: [PATCH 3/4] Tests: made assert description more meaningful. --- tests/plugins/mathjax/mathjax.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/plugins/mathjax/mathjax.js b/tests/plugins/mathjax/mathjax.js index 31d12996732..e6c3a17cc22 100644 --- a/tests/plugins/mathjax/mathjax.js +++ b/tests/plugins/mathjax/mathjax.js @@ -52,7 +52,7 @@ } assert.isString( mathJaxLib, - 'bender.config.mathJaxLibPath should be defined with the path to MathJax lib used for testing.' ); + 'bender.config.mathJaxLibPath should be defined with the path to MathJax lib (MathJax.js?config=TeX-AMS_HTML).' ); var tc = this; From 3588f4ecf2ca790d6a8951573f476bce8ed4a3db Mon Sep 17 00:00:00 2001 From: Piotr Jasiun Date: Mon, 2 Mar 2015 11:39:13 +0100 Subject: [PATCH 4/4] Changelog entry. --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 1c0cc225d39..331e00ba4d9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,6 +13,7 @@ Fixed Issues: Other Changes: * [#12844](http://dev.ckeditor.com/ticket/12844): Upgraded the [testing environment](http://docs.ckeditor.com/#!/guide/dev_tests) to [Bender.js](https://github.com/benderjs/benderjs) `0.2.*`. +* [#12930](http://dev.ckeditor.com/ticket/12930): Because of licenses, removed truncated-mathjax from the test directory, now `bender.config.mathJaxLibPath` need to be configured manually. ## CKEditor 4.4.7