Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/57850
Change subject: Transactions to store metadata merge info when present ...................................................................... Transactions to store metadata merge info when present To begin with this is just a failingtest case which illustrates the problem. Bug: 46954 Change-Id: I4edad1c2dd37c723bff2792bab7d694ef17a86dc --- M modules/ve/test/dm/ve.dm.TransactionProcessor.test.js 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/50/57850/1 diff --git a/modules/ve/test/dm/ve.dm.TransactionProcessor.test.js b/modules/ve/test/dm/ve.dm.TransactionProcessor.test.js index c2d026d..1a43634 100644 --- a/modules/ve/test/dm/ve.dm.TransactionProcessor.test.js +++ b/modules/ve/test/dm/ve.dm.TransactionProcessor.test.js @@ -9,7 +9,7 @@ /* Tests */ -QUnit.test( 'commit/rollback', 86, function ( assert ) { +QUnit.test( 'commit/rollback', 90, function ( assert ) { var i, key, originalData, originalDoc, msg, testDoc, tx, expectedData, expectedDoc, store = ve.dm.example.createExampleDocument().getStore(), @@ -338,6 +338,18 @@ 'expected': function( data ) { data.splice( 27, 2, metaElementInsert, metaElementInsertClose ); } + }, + 'removing data from between metadata merges metadata': { + 'data': ve.dm.example.withMeta, + 'calls': [ + ['pushRetain', 9 ], + ['pushReplace', ve.dm.example.withMetaPlainData[9], [] ], + ['pushRetain', 3 ], + ], + 'expected': function( data ) { + data.splice( 19, 1 ); + ve.setProp( data[4], 'internal', 'changed', 'content', 1 ); + } } }; -- To view, visit https://gerrit.wikimedia.org/r/57850 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4edad1c2dd37c723bff2792bab7d694ef17a86dc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders <esand...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits