[MediaWiki-commits] [Gerrit] Annotation tests: Allow originalDomElements preservation - change (VisualEditor/VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/254334

Change subject: Annotation tests: Allow originalDomElements preservation
......................................................................

Annotation tests: Allow originalDomElements preservation

Change-Id: Iff15190e83ffb67bd73a7086f774439093409837
---
M tests/dm/ve.dm.example.js
M tests/ve.test.utils.js
2 files changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/34/254334/1

diff --git a/tests/dm/ve.dm.example.js b/tests/dm/ve.dm.example.js
index f59992e..6eb6f8e 100644
--- a/tests/dm/ve.dm.example.js
+++ b/tests/dm/ve.dm.example.js
@@ -59,9 +59,10 @@
  *
  * @param {Array} data Linear model data. Will be modified.
  * @param {ve.dm.IndexValueStore} store Index-value store to resolve 
annotations in
+ * @param {boolean} [preserveDomElements] Preserve original DOM elements
  * @return {Array} The given `data` parameter.
  */
-ve.dm.example.postprocessAnnotations = function ( data, store ) {
+ve.dm.example.postprocessAnnotations = function ( data, store, 
preserveDomElements ) {
        var i, j, key;
 
        for ( i = 0; i < data.length; i++ ) {
@@ -71,7 +72,7 @@
                        data[ i ][ key ] = new ve.dm.AnnotationSet( store, 
data[ i ][ key ] ).get();
                        for ( j = 0; j < data[ i ][ key ].length; j++ ) {
                                data[ i ][ key ][ j ] = data[ i ][ key ][ j 
].element;
-                               if ( data[ i ][ key ][ j ].originalDomElements 
) {
+                               if ( !preserveDomElements && data[ i ][ key ][ 
j ].originalDomElements ) {
                                        // Make a shallow clone and remove 
.originalDomElements from it
                                        data[ i ][ key ][ j ] = $.extend( {}, 
data[ i ][ key ][ j ] );
                                        delete data[ i ][ key ][ j 
].originalDomElements;
diff --git a/tests/ve.test.utils.js b/tests/ve.test.utils.js
index 2a9bd25..6d7d6cf 100644
--- a/tests/ve.test.utils.js
+++ b/tests/ve.test.utils.js
@@ -121,7 +121,7 @@
                        actualRtDoc = ve.dm.converter.getDomFromModel( model );
 
                        // Normalize and verify data
-                       ve.dm.example.postprocessAnnotations( actualData, 
model.getStore() );
+                       ve.dm.example.postprocessAnnotations( actualData, 
model.getStore(), caseItem.preserveAnnotationDomElements );
                        assert.equalLinearData( actualData, caseItem.data, msg 
+ ': data' );
                        assert.deepEqual( model.getInnerWhitespace(), 
caseItem.innerWhitespace || new Array( 2 ), msg + ': inner whitespace' );
                        if ( caseItem.storeLength !== undefined ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/254334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff15190e83ffb67bd73a7086f774439093409837
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/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