Merge branch 't/12930'

ckeditor · Mar 2, 2015 · d3b2b45 · d3b2b45
2 parents 4176abb + 3588f4e
commit d3b2b45
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git 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
 

diff --git 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: ''
 					},
 					fire: function() {
 						//mock

diff --git 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;
 
 	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 (MathJax.js?config=TeX-AMS_HTML).' );
 
 			var tc = this;