jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master
......................................................................
Update VE core submodule to master
Also update MWConverter.test.js for test util changes.
New changes:
863288b Update OOjs UI to v0.1.0-pre (af97c1caec)
0bb2404 Refactor converter test utils to run single test cases
Change-Id: I90273786ac186df3eec13270f94d655b605bfdc4
---
M lib/ve
M modules/ve-mw/test/dm/ve.dm.MWConverter.test.js
2 files changed, 49 insertions(+), 2 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/ve b/lib/ve
index 677574c..04b9c67 160000
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 677574cc70b0107d4c5b984fe8198c63ff53d651
+Subproject commit 04b9c67389540a75e2c4e935b886e8967e9859de
diff --git a/modules/ve-mw/test/dm/ve.dm.MWConverter.test.js
b/modules/ve-mw/test/dm/ve.dm.MWConverter.test.js
index 24174f2..c16aaf7 100644
--- a/modules/ve-mw/test/dm/ve.dm.MWConverter.test.js
+++ b/modules/ve-mw/test/dm/ve.dm.MWConverter.test.js
@@ -5,14 +5,61 @@
* @license The MIT License (MIT); see LICENSE.txt
*/
+/*global mw */
+
QUnit.module( 've.dm.MWConverter' );
/* Tests */
+function setMwConfig( newConfig ) {
+ var key, oldConfig = {};
+ for ( key in newConfig ) {
+ // Store orignal value
+ oldConfig[key] = mw.config.get( key );
+ // Override config setting
+ mw.config.set( key, newConfig[key] );
+ }
+ return oldConfig;
+}
+
QUnit.test( 'getModelFromDom', function ( assert ) {
- ve.test.utils.runGetModelFromDomTests( assert, ve.copy(
ve.dm.mwExample.domToDataCases ) );
+ var msg, caseItem,
+ originalConfig,
+ cases = ve.dm.mwExample.domToDataCases;
+
+ QUnit.expect( ve.test.utils.countGetModelFromDomTests( cases ) );
+
+ for ( msg in cases ) {
+ caseItem = ve.copy( cases[msg] );
+ if ( caseItem.mwConfig ) {
+ originalConfig = setMwConfig( caseItem.mwConfig );
+ }
+
+ ve.test.utils.runGetModelFromDomTest( assert, caseItem );
+
+ if ( caseItem.mwConfig ) {
+ setMwConfig( originalConfig );
+ }
+ }
} );
QUnit.test( 'getDomFromModel', function ( assert ) {
- ve.test.utils.runGetDomFromModelTests( assert, ve.copy(
ve.dm.mwExample.domToDataCases ) );
+ var msg, caseItem,
+ originalConfig,
+ cases = ve.dm.mwExample.domToDataCases;
+
+ QUnit.expect( 2 * Object.keys( cases ).length );
+
+ for ( msg in cases ) {
+ caseItem = ve.copy( cases[msg] );
+ if ( caseItem.mwConfig ) {
+ originalConfig = setMwConfig( caseItem.mwConfig );
+ }
+
+ ve.test.utils.runGetDomFromModelTest( assert, caseItem );
+
+ if ( caseItem.mwConfig ) {
+ setMwConfig( originalConfig );
+ }
+ }
} );
--
To view, visit https://gerrit.wikimedia.org/r/107539
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I90273786ac186df3eec13270f94d655b605bfdc4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
