[MediaWiki-commits] [Gerrit] tests: Use model-only surface in ListAction test - change (VisualEditor/VisualEditor)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: tests: Use model-only surface in ListAction test
......................................................................


tests: Use model-only surface in ListAction test

Takes 4-500ms off test times locally.

Requires a little refactoring inside ListAction.

Change-Id: I6c603e38c1c5038f56cf14022e214d124e549ade
---
M src/ui/actions/ve.ui.ListAction.js
M tests/ui/actions/ve.ui.ListAction.test.js
2 files changed, 11 insertions(+), 11 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/ui/actions/ve.ui.ListAction.js 
b/src/ui/actions/ve.ui.ListAction.js
index 93c905d..fa8b9b0 100644
--- a/src/ui/actions/ve.ui.ListAction.js
+++ b/src/ui/actions/ve.ui.ListAction.js
@@ -202,6 +202,7 @@
  */
 ve.ui.ListAction.prototype.unwrap = function ( noBreakpoints ) {
        var node,
+               indentationAction = ve.ui.actionFactory.create( 'indentation', 
this.surface ),
                surfaceModel = this.surface.getModel(),
                documentModel = surfaceModel.getDocument();
 
@@ -215,7 +216,7 @@
 
        do {
                node = documentModel.getBranchNodeFromOffset( 
surfaceModel.getSelection().getRange().start );
-       } while ( node.hasMatchingAncestor( 'list' ) && this.surface.execute( 
'indentation', 'decrease' ) );
+       } while ( node.hasMatchingAncestor( 'list' ) && 
indentationAction.decrease() );
 
        if ( !noBreakpoints ) {
                surfaceModel.breakpoint();
diff --git a/tests/ui/actions/ve.ui.ListAction.test.js 
b/tests/ui/actions/ve.ui.ListAction.test.js
index ac80601..081ea96 100644
--- a/tests/ui/actions/ve.ui.ListAction.test.js
+++ b/tests/ui/actions/ve.ui.ListAction.test.js
@@ -9,27 +9,26 @@
 /* Tests */
 
 function runListConverterTest( assert, html, method, style, range, 
expectedRange, expectedData, expectedOriginalData, msg ) {
-       var surface = ve.test.utils.createSurfaceFromHtml( html || 
ve.dm.example.html ),
+       var surface = ve.test.utils.createModelOnlySurfaceFromHtml( html || 
ve.dm.example.html ),
+               surfaceModel = surface.getModel(),
                listAction = new ve.ui.ListAction( surface ),
-               data = ve.copy( surface.getModel().getDocument().getFullData() 
),
+               data = ve.copy( surfaceModel.getDocument().getFullData() ),
                originalData = ve.copy( data );
 
        expectedData( data );
        if ( expectedOriginalData ) {
                expectedOriginalData( originalData );
        }
-       surface.getModel().setLinearSelection( range );
+       surfaceModel.setLinearSelection( range );
        listAction[ method ]( style );
 
-       assert.equalLinearData( surface.getModel().getDocument().getFullData(), 
data, msg + ': data models match' );
-       assert.equalRange( surface.getModel().getSelection().getRange(), 
expectedRange, msg + ': ranges match' );
+       assert.equalLinearData( surfaceModel.getDocument().getFullData(), data, 
msg + ': data models match' );
+       assert.equalRange( surfaceModel.getSelection().getRange(), 
expectedRange, msg + ': ranges match' );
 
-       surface.getModel().undo();
+       surfaceModel.undo();
 
-       assert.equalLinearData( surface.getModel().getDocument().getFullData(), 
originalData, msg + ' (undo): data models match' );
-       assert.equalRange( surface.getModel().getSelection().getRange(), range, 
msg + ' (undo): ranges match' );
-
-       surface.destroy();
+       assert.equalLinearData( surfaceModel.getDocument().getFullData(), 
originalData, msg + ' (undo): data models match' );
+       assert.equalRange( surfaceModel.getSelection().getRange(), range, msg + 
' (undo): ranges match' );
 }
 
 QUnit.test( '(un)wrap', function ( assert ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c603e38c1c5038f56cf14022e214d124e549ade
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits