jenkins-bot has submitted this change and it was merged.
Change subject: Test clipboard mode in converter
......................................................................
Test clipboard mode in converter
Change-Id: I27ed616c2b6f416f1b0c5ca74bc6fa77a50a54eb
---
M tests/dm/ve.dm.Converter.test.js
M tests/dm/ve.dm.example.js
M tests/ve.test.utils.js
3 files changed, 22 insertions(+), 9 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/dm/ve.dm.Converter.test.js b/tests/dm/ve.dm.Converter.test.js
index e98cd47..3b10383 100644
--- a/tests/dm/ve.dm.Converter.test.js
+++ b/tests/dm/ve.dm.Converter.test.js
@@ -21,7 +21,7 @@
QUnit.test( 'getDomFromModel', function ( assert ) {
var msg, cases = ve.dm.example.domToDataCases;
- QUnit.expect( 2 * ve.getObjectKeys( cases ).length );
+ QUnit.expect( 3 * ve.getObjectKeys( cases ).length );
for ( msg in cases ) {
ve.test.utils.runGetDomFromModelTest( assert, ve.copy(
cases[msg] ), msg );
diff --git a/tests/dm/ve.dm.example.js b/tests/dm/ve.dm.example.js
index af499d7..5d9b001 100644
--- a/tests/dm/ve.dm.example.js
+++ b/tests/dm/ve.dm.example.js
@@ -1192,7 +1192,8 @@
{ type: '/paragraph' },
{ type: 'internalList' },
{ type: '/internalList' }
- ]
+ ],
+ clipboardBody: '<p><b><span rel="ve:Comment"
data-ve-comment="foo"></span>bar<span rel="ve:Comment"
data-ve-comment="baz"></span></b></p>'
},
'annotated metadata': {
body: '<p><b><meta />bar<meta /></b></p>',
@@ -1521,7 +1522,8 @@
{ type: '/paragraph' },
{ type: 'internalList' },
{ type: '/internalList' }
- ]
+ ],
+ clipboardBody: '<span rel="ve:Comment" data-ve-comment="
comment "></span>'
},
'empty document with content added by the editor': {
data: [
@@ -1646,7 +1648,8 @@
{ type: '/paragraph' },
{ type: 'internalList' },
{ type: '/internalList' }
- ]
+ ],
+ clipboardBody: '<p>Foo<b><span rel="ve:Comment"
data-ve-comment=" Bar "></span></b>Baz</p>'
},
'empty annotation with metadata': {
body: '<p>Foo<b><meta /></b>Baz</p>',
@@ -2240,7 +2243,8 @@
{ type: '/paragraph' },
{ type: 'internalList' },
{ type: '/internalList' }
- ]
+ ],
+ clipboardBody: '<span rel="ve:Comment" data-ve-comment=" Foo
"></span> <span rel="ve:Comment" data-ve-comment=" Bar "></span>\nFoo'
},
'whitespace preservation with comments at end of wrapper paragraph': {
body: '<ul><li> bar<!-- baz -->quux </li></ul>',
@@ -2282,7 +2286,8 @@
{ type: '/list' },
{ type: 'internalList' },
{ type: '/internalList' }
- ]
+ ],
+ clipboardBody: '<ul><li> bar<span rel="ve:Comment"
data-ve-comment=" baz "></span>quux </li></ul>'
},
'whitespace preservation with metadata and space at end of wrapper
paragraph': {
body: '<ul><li> bar<meta />quux </li></ul>',
@@ -2467,7 +2472,8 @@
{ type: '/paragraph' },
{ type: 'internalList' },
{ type: '/internalList' }
- ]
+ ],
+ clipboardBody: '<p> <span rel="ve:Comment" data-ve-comment="
foo "></span>bar<span rel="ve:Comment" data-ve-comment=" baz "></span> </p>'
},
'whitespace surrounding metadata in a wrapper': {
body: '<b>Foo</b> <meta />\n<i>Bar</i>',
diff --git a/tests/ve.test.utils.js b/tests/ve.test.utils.js
index c3c3fdc..1db0188 100644
--- a/tests/ve.test.utils.js
+++ b/tests/ve.test.utils.js
@@ -140,7 +140,7 @@
};
ve.test.utils.runGetDomFromModelTest = function ( assert, caseItem, msg
) {
- var originalData, model, store, i, length, html;
+ var originalData, model, store, i, length, html, fromDataBody,
clipboardHtml;
store = new ve.dm.IndexValueStore();
// Load storeItems into store
@@ -155,12 +155,19 @@
caseItem.modify( model );
}
originalData = ve.copy( model.getFullData() );
- html = '<body>' + ( caseItem.fromDataBody ||
caseItem.normalizedBody || caseItem.body ) + '</body>';
+ fromDataBody = caseItem.fromDataBody || caseItem.normalizedBody
|| caseItem.body;
+ html = '<body>' + fromDataBody + '</body>';
+ clipboardHtml = '<body>' + ( caseItem.clipboardBody ||
fromDataBody ) + '</body>';
assert.equalDomElement(
ve.dm.converter.getDomFromModel( model ),
ve.createDocumentFromHtml( html ),
msg
);
+ assert.equalDomElement(
+ ve.dm.converter.getDomFromModel( model, true ),
+ ve.createDocumentFromHtml( clipboardHtml ),
+ msg + ' (clipboard mode)'
+ );
assert.deepEqualWithDomElements( model.getFullData(),
originalData, msg + ' (data hasn\'t changed)' );
};
--
To view, visit https://gerrit.wikimedia.org/r/190849
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I27ed616c2b6f416f1b0c5ca74bc6fa77a50a54eb
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
