Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/405810 )
Change subject: Remove metadata from unit tests
......................................................................
Remove metadata from unit tests
Metadata is being removed from VE.
Change-Id: Icc614ed7a9792b7d9475d7a804bb8eea48424043
---
M modules/ve-cite/tests/ve.dm.Transaction.test.js
M modules/ve-cite/tests/ve.dm.citeExample.js
2 files changed, 2 insertions(+), 110 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite
refs/changes/10/405810/1
diff --git a/modules/ve-cite/tests/ve.dm.Transaction.test.js
b/modules/ve-cite/tests/ve.dm.Transaction.test.js
index 57032a6..18f0486 100644
--- a/modules/ve-cite/tests/ve.dm.Transaction.test.js
+++ b/modules/ve-cite/tests/ve.dm.Transaction.test.js
@@ -11,7 +11,6 @@
QUnit.test( 'newFromDocumentInsertion with references', function ( assert ) {
var i, j, doc2, tx, actualStoreItems, expectedStoreItems, removalOps,
doc,
complexDoc = ve.dm.citeExample.createExampleDocument(
'complexInternalData' ),
- comment = { type: 'alienMeta', originalDomElements: $( '<!--
hello -->' ).toArray() },
withReference = [
{ type: 'paragraph' },
'B', 'a', 'r',
@@ -38,96 +37,6 @@
],
cases = [
{
- msg: 'metadata insertion',
- doc: 'complexInternalData',
- offset: 0,
- range: new ve.Range( 0, 7 ),
- modify: function ( newDoc ) {
- newDoc.commit(
ve.dm.TransactionBuilder.static.newFromMetadataInsertion(
- newDoc, 4, 0, [ comment ]
- ) );
- },
- removalOps: [
- {
- type: 'replace',
- remove: complexDoc.getData( new
ve.Range( 0, 7 ) ),
- insert: [
- { type: 'paragraph' },
- { type: '/paragraph' }
- ],
- removeMetadata:
complexDoc.getMetadata( new ve.Range( 0, 7 ) ),
- insertMetadata: [ undefined,
undefined ],
- insertedDataLength: 2,
- insertedDataOffset: 0
- },
- { type: 'retain', length: 26 }
- ],
- expectedOps: [
- {
- type: 'replace',
- remove: [],
- insert: complexDoc.getData( new
ve.Range( 0, 4 ) )
- // Reference gets
(unnecessarily) renumbered from auto/0 to auto/1
- .concat( [
-
ve.extendObject( true, {}, complexDoc.data.data[ 4 ],
- {
attributes: { listKey: 'auto/1' } }
- )
- ] )
- .concat(
complexDoc.getData( new ve.Range( 5, 7 ) ) ),
- removeMetadata: [],
- insertMetadata:
complexDoc.getMetadata( new ve.Range( 0, 4 ) )
- .concat( [ [ comment ]
] )
- .concat(
complexDoc.getMetadata( new ve.Range( 5, 7 ) ) )
- },
- { type: 'retain', length: 3 },
- {
- type: 'replace',
- remove: complexDoc.getData( new
ve.Range( 8, 32 ) ),
- insert: complexDoc.getData( new
ve.Range( 8, 32 ) ),
- removeMetadata:
complexDoc.getMetadata( new ve.Range( 8, 32 ) ),
- insertMetadata:
complexDoc.getMetadata( new ve.Range( 8, 32 ) )
- },
- { type: 'retain', length: 1 }
- ]
- },
- {
- msg: 'metadata removal',
- doc: 'complexInternalData',
- offset: 24,
- range: new ve.Range( 24, 31 ),
- modify: function ( newDoc ) {
- newDoc.commit(
ve.dm.TransactionBuilder.static.newFromMetadataRemoval(
- newDoc, 6, new ve.Range( 0, 1 )
- ) );
- },
- removalOps: [
- { type: 'retain', length: 24 },
- {
- type: 'replace',
- remove: complexDoc.getData( new
ve.Range( 24, 31 ) ),
- insert: [],
- removeMetadata:
complexDoc.getMetadata( new ve.Range( 24, 31 ) ),
- insertMetadata: []
- },
- { type: 'retain', length: 2 }
- ],
- expectedOps: [
- { type: 'retain', length: 8 },
- {
- type: 'replace',
- remove: complexDoc.getData( new
ve.Range( 8, 24 ) )
- .concat(
complexDoc.getData( new ve.Range( 31, 32 ) ) ),
- insert: complexDoc.getData( new
ve.Range( 8, 32 ) ),
- removeMetadata:
complexDoc.getMetadata( new ve.Range( 8, 24 ) )
- .concat(
complexDoc.getMetadata( new ve.Range( 31, 32 ) ) ),
- insertMetadata:
complexDoc.getMetadata( new ve.Range( 8, 30 ) )
- .concat( [ [] ] )
- .concat(
complexDoc.getMetadata( new ve.Range( 31, 32 ) ) )
- },
- { type: 'retain', length: 1 }
- ]
- },
- {
msg: 'inserting a brand new document; internal
lists are merged and items renumbered',
doc: 'complexInternalData',
offset: 7,
@@ -153,10 +62,7 @@
type: 'replace',
remove: complexDoc.getData( new
ve.Range( 8, 32 ) ),
insert: complexDoc.getData( new
ve.Range( 8, 32 ) )
- .concat(
withReference.slice( 8, 15 ) ),
- removeMetadata:
complexDoc.getMetadata( new ve.Range( 8, 32 ) ),
- insertMetadata:
complexDoc.getMetadata( new ve.Range( 8, 32 ) )
- .concat( new Array( 7 )
)
+ .concat(
withReference.slice( 8, 15 ) )
},
{ type: 'retain', length: 1 }
]
diff --git a/modules/ve-cite/tests/ve.dm.citeExample.js
b/modules/ve-cite/tests/ve.dm.citeExample.js
index 3551f2e..63982b5 100644
--- a/modules/ve-cite/tests/ve.dm.citeExample.js
+++ b/modules/ve-cite/tests/ve.dm.citeExample.js
@@ -309,7 +309,7 @@
{ type: '/internalList' }
]
},
- 'mw:Reference with metadata': {
+ 'mw:Reference with comment': {
body: '<p><sup about="#mwt2" class="reference" ' +
'data-mw="{"name":"ref","body":' +
'{"html":"Foo<!-- bar
-->"},"attrs":{}}" ' +
@@ -528,8 +528,6 @@
ve.dm.citeExample.complexInternalData = [
// 0
- { type: 'alienMeta', originalDomElements: $( '<!-- before -->'
).toArray() },
- { type: '/alienMeta' },
{ type: 'paragraph' },
'F', [ 'o', [ ve.dm.example.bold ] ], [ 'o', [ ve.dm.example.italic ] ],
// 4
@@ -544,8 +542,6 @@
{ type: '/mwReference' },
// 6
{ type: '/paragraph' },
- { type: 'alienMeta', originalDomElements: $( '<!-- after -->'
).toArray() },
- { type: '/alienMeta' },
// 7
{ type: 'internalList' },
// 8
@@ -554,8 +550,6 @@
{ type: 'paragraph', internal: { generated: 'wrapper' } },
'R', [ 'e', [ ve.dm.example.bold ] ], 'f',
// 13
- { type: 'alienMeta', originalDomElements: $( '<!-- reference -->'
).toArray() },
- { type: '/alienMeta' },
'e', [ 'r', [ ve.dm.example.italic ] ], [ 'e', [ ve.dm.example.italic ]
],
// 16
{ type: 'mwReference', attributes: {
@@ -576,23 +570,15 @@
{ type: '/internalItem' },
// 23
{ type: 'internalItem' },
- { type: 'alienMeta', originalDomElements: $( '<!-- beginning -->'
).toArray() },
- { type: '/alienMeta' },
// 24
{ type: 'preformatted' },
- { type: 'alienMeta', originalDomElements: $( '<!-- inside -->'
).toArray() },
- { type: '/alienMeta' },
// 25
{ type: 'mwEntity', attributes: { character: '€' } },
// 26
{ type: '/mwEntity' },
'2', '5', '0',
- { type: 'alienMeta', originalDomElements: $( '<!-- inside2 -->'
).toArray() },
- { type: '/alienMeta' },
// 30
{ type: '/preformatted' },
- { type: 'alienMeta', originalDomElements: $( '<!-- end -->' ).toArray()
},
- { type: '/alienMeta' },
// 31
{ type: '/internalItem' },
// 32
--
To view, visit https://gerrit.wikimedia.org/r/405810
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc614ed7a9792b7d9475d7a804bb8eea48424043
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
