Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197057
Change subject: Update alien tests
......................................................................
Update alien tests
Depends on Id253f791 in core.
Change-Id: I26a7ebc709fae9d2365a7f9ce2c4cfdcc10620a2
---
M modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js
M modules/ve-mw/tests/dm/ve.dm.Transaction.test.js
M modules/ve-mw/tests/dm/ve.dm.mwExample.js
3 files changed, 20 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/57/197057/1
diff --git a/modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js
b/modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js
index 2e00331..485fcc5 100644
--- a/modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js
+++ b/modules/ve-mw/tests/ce/ve.ce.ContentBranchNode.test.js
@@ -27,7 +27,7 @@
['d', [ { type: 'textStyle/bold' } ]],
{
type: 'alienInline',
- attributes: { domElements: $(
'<tt>e</tt>' ).toArray() },
+ originalDomElements: $( '<tt>e</tt>'
).toArray(),
annotations: [ { type: 'textStyle/bold'
} ]
},
{ type: '/alienInline' },
diff --git a/modules/ve-mw/tests/dm/ve.dm.Transaction.test.js
b/modules/ve-mw/tests/dm/ve.dm.Transaction.test.js
index e7f7846..ff9b353 100644
--- a/modules/ve-mw/tests/dm/ve.dm.Transaction.test.js
+++ b/modules/ve-mw/tests/dm/ve.dm.Transaction.test.js
@@ -11,7 +11,7 @@
QUnit.test( 'newFromDocumentInsertion with references', function ( assert ) {
var i, j, doc2, tx, actualStoreItems, expectedStoreItems, removalOps,
doc,
complexDoc = ve.dm.mwExample.createExampleDocument(
'complexInternalData' ),
- comment = { type: 'alienMeta', attributes: { domElements: $(
'<!-- hello -->' ).get() } },
+ comment = { type: 'alienMeta', originalDomElements: $( '<!--
hello -->' ).toArray() },
withReference = [
{ type: 'paragraph' },
'B', 'a', 'r',
diff --git a/modules/ve-mw/tests/dm/ve.dm.mwExample.js
b/modules/ve-mw/tests/dm/ve.dm.mwExample.js
index 6e550bf..2f072d2 100644
--- a/modules/ve-mw/tests/dm/ve.dm.mwExample.js
+++ b/modules/ve-mw/tests/dm/ve.dm.mwExample.js
@@ -363,9 +363,7 @@
{ type: '/paragraph' },
{
type: 'mwAlienMeta',
- attributes: {
- domElements: $( '<meta property="mw:ThisIsAnAlien" />'
).toArray()
- }
+ originalDomElements: $( '<meta property="mw:ThisIsAnAlien" />'
).toArray()
},
{ type: '/mwAlienMeta' },
{ type: 'paragraph' },
@@ -388,9 +386,7 @@
'r',
{
type: 'mwAlienMeta',
- attributes: {
- domElements: $( '<meta property="mw:foo" content="bar"
/>' ).toArray()
- }
+ originalDomElements: $( '<meta property="mw:foo" content="bar"
/>' ).toArray()
},
{ type: '/mwAlienMeta' },
'B',
@@ -406,9 +402,7 @@
{ type: '/paragraph' },
{
type: 'mwAlienMeta',
- attributes: {
- domElements: $( '<meta property="mw:bar" content="baz"
/>' ).toArray()
- }
+ originalDomElements: $( '<meta property="mw:bar" content="baz"
/>' ).toArray()
},
{ type: '/mwAlienMeta' },
{
@@ -438,9 +432,7 @@
{ type: '/mwCategory' },
{
type: 'mwAlienMeta',
- attributes: {
- domElements: $( '<meta typeof="mw:Placeholder"
data-parsoid="foobar" />' ).toArray()
- }
+ originalDomElements: $( '<meta typeof="mw:Placeholder"
data-parsoid="foobar" />' ).toArray()
},
{ type: '/mwAlienMeta' },
{ type: 'internalList' },
@@ -467,15 +459,11 @@
[
{
type: 'alienMeta',
- attributes: {
- domElements: $( '<!-- No content conversion
-->' ).toArray()
- }
+ originalDomElements: $( '<!-- No content conversion
-->' ).toArray()
},
{
type: 'mwAlienMeta',
- attributes: {
- domElements: $( '<meta
property="mw:ThisIsAnAlien" />' ).toArray()
- }
+ originalDomElements: $( '<meta
property="mw:ThisIsAnAlien" />' ).toArray()
}
],
undefined,
@@ -498,27 +486,21 @@
[
{
type: 'mwAlienMeta',
- attributes: {
- domElements: $( '<meta property="mw:foo"
content="bar" />' ).toArray()
- }
+ originalDomElements: $( '<meta property="mw:foo"
content="bar" />' ).toArray()
}
],
undefined,
[
{
type: 'alienMeta',
- attributes: {
- domElements: $( '<!-- inline -->' ).toArray()
- }
+ originalDomElements: $( '<!-- inline -->' ).toArray()
}
],
undefined,
[
{
type: 'mwAlienMeta',
- attributes: {
- domElements: $( '<meta property="mw:bar"
content="baz" />' ).toArray()
- }
+ originalDomElements: $( '<meta property="mw:bar"
content="baz" />' ).toArray()
},
{
type: 'comment',
@@ -538,9 +520,7 @@
},
{
type: 'mwAlienMeta',
- attributes: {
- domElements: $( '<meta typeof="mw:Placeholder"
data-parsoid="foobar" />' ).toArray()
- }
+ originalDomElements: $( '<meta typeof="mw:Placeholder"
data-parsoid="foobar" />' ).toArray()
}
],
undefined,
@@ -661,13 +641,13 @@
{ type: '/paragraph' },
{
type: 'mwReferencesList',
+ // orginalDomElements: HTML,
attributes: {
mw: {
name: 'references',
attrs: { group: 'g1' }
},
originalMw:
'{"name":"references","attrs":{"group":"g1"}"}',
- // domElements: HTML,
listGroup: 'mwReference/',
refGroup: ''
}
@@ -704,7 +684,7 @@
ve.dm.mwExample.complexInternalData = [
// 0
- { type: 'alienMeta', attributes: { domElements: $( '<!-- before -->'
).get() } },
+ { type: 'alienMeta', originalDomElements: $( '<!-- before -->'
).toArray() },
{ type: '/alienMeta' },
{ type: 'paragraph' },
'F', ['o', [ve.dm.example.bold]], ['o', [ve.dm.example.italic]],
@@ -722,7 +702,7 @@
{ type: '/mwReference' },
// 6
{ type: '/paragraph' },
- { type: 'alienMeta', attributes: { domElements: $( '<!-- after -->'
).get() } },
+ { type: 'alienMeta', originalDomElements: $( '<!-- after -->'
).toArray() },
{ type: '/alienMeta' },
// 7
{ type: 'internalList' },
@@ -732,7 +712,7 @@
{ type: 'paragraph', internal: { generated: 'wrapper' } },
'R', ['e', [ve.dm.example.bold]], 'f',
// 13
- { type: 'alienMeta', attributes: { domElements: $( '<!-- reference -->'
).get() } },
+ { type: 'alienMeta', originalDomElements: $( '<!-- reference -->'
).toArray() },
{ type: '/alienMeta' },
'e', ['r', [ve.dm.example.italic]], ['e', [ve.dm.example.italic]],
// 16
@@ -754,22 +734,22 @@
{ type: '/internalItem' },
// 23
{ type: 'internalItem' },
- { type: 'alienMeta', attributes: { domElements: $( '<!-- beginning -->'
).get() } },
+ { type: 'alienMeta', originalDomElements: $( '<!-- beginning -->'
).toArray() },
{ type: '/alienMeta' },
// 24
{ type: 'preformatted' },
- { type: 'alienMeta', attributes: { domElements: $( '<!-- inside -->'
).get() } },
+ { type: 'alienMeta', originalDomElements: $( '<!-- inside -->'
).toArray() },
{ type: '/alienMeta' },
// 25
{ type: 'mwEntity', attributes: { character: '€' } },
// 26
{ type: '/mwEntity' },
'2', '5', '0',
- { type: 'alienMeta', attributes: { domElements: $( '<!-- inside2 -->'
).get() } },
+ { type: 'alienMeta', originalDomElements: $( '<!-- inside2 -->'
).toArray() },
{ type: '/alienMeta' },
// 30
{ type: '/preformatted' },
- { type: 'alienMeta', attributes: { domElements: $( '<!-- end -->'
).get() } },
+ { type: 'alienMeta', originalDomElements: $( '<!-- end -->' ).toArray()
},
{ type: '/alienMeta' },
// 31
{ type: '/internalItem' },
--
To view, visit https://gerrit.wikimedia.org/r/197057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I26a7ebc709fae9d2365a7f9ce2c4cfdcc10620a2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
