[MediaWiki-commits] [Gerrit] Genericise runSurfaceHandleDeleteTest to work with other 'ha... - change (mediawiki...VisualEditor)

[jenkins-bot (Code Review)]

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

Change subject: Genericise runSurfaceHandleDeleteTest to work with other 
'handle' methods
......................................................................


Genericise runSurfaceHandleDeleteTest to work with other 'handle' methods

We will want to reuse this test runner for handleEnter and handleInsertion.

Change-Id: I7489bf2d20fa17b1c164ff20e0cfcd9b9d5102d2
---
M modules/ve-mw/test/ce/ve.ce.Surface.test.js
M modules/ve/test/ce/ve.ce.Surface.test.js
2 files changed, 12 insertions(+), 12 deletions(-)

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



diff --git a/modules/ve-mw/test/ce/ve.ce.Surface.test.js 
b/modules/ve-mw/test/ce/ve.ce.Surface.test.js
index 1eb190c..58dd4e8 100644
--- a/modules/ve-mw/test/ce/ve.ce.Surface.test.js
+++ b/modules/ve-mw/test/ce/ve.ce.Surface.test.js
@@ -52,7 +52,7 @@
        QUnit.expect( cases.length * 2 );
 
        for ( i = 0; i < cases.length; i++ ) {
-               ve.test.utils.runSurfaceHandleDeleteTest(
+               ve.test.utils.runSurfaceHandleSpecialKeyTest(
                        assert, cases[i].html, cases[i].range, 
cases[i].operations,
                        cases[i].expectedData, cases[i].expectedRange, 
cases[i].msg
                );
diff --git a/modules/ve/test/ce/ve.ce.Surface.test.js 
b/modules/ve/test/ce/ve.ce.Surface.test.js
index 39259da..4eeb46d 100644
--- a/modules/ve/test/ce/ve.ce.Surface.test.js
+++ b/modules/ve/test/ce/ve.ce.Surface.test.js
@@ -9,14 +9,14 @@
 
 /* Tests */
 
-ve.test.utils.runSurfaceHandleDeleteTest = function ( assert, html, range, 
operations, expectedData, expectedRange, msg ) {
-       var i, args,
+ve.test.utils.runSurfaceHandleSpecialKeyTest = function ( assert, html, range, 
operations, expectedData, expectedRange, msg ) {
+       var i, method, args,
                selection,
-               deleteArgs = {
-                       'backspace': [ {}, true ],
-                       'delete': [ {}, false ],
-                       'modifiedBackspace': [ { 'ctrlKey': true }, true ],
-                       'modifiedDelete': [ { 'ctrlKey': true }, false ]
+               actions = {
+                       'backspace': [ 'handleDelete', {}, true ],
+                       'delete': [ 'handleDelete', {}, false ],
+                       'modifiedBackspace': [ 'handleDelete', { 'ctrlKey': 
true }, true ],
+                       'modifiedDelete': [ 'handleDelete', { 'ctrlKey': true 
}, false ]
                },
                surface = ve.test.utils.createSurfaceFromHtml( html || 
ve.dm.example.html ),
                view = surface.getView(),
@@ -33,8 +33,9 @@
 
        model.setSelection( range );
        for ( i = 0; i < operations.length; i++ ) {
-               args = deleteArgs[operations[i]];
-               view.handleDelete( args[0], args[1] );
+               method = actions[operations[i]][0];
+               args = actions[operations[i]].slice( 1 );
+               view[method].apply( view, args );
        }
        expectedData( data );
 
@@ -137,7 +138,7 @@
        QUnit.expect( cases.length * 2 );
 
        for ( i = 0; i < cases.length; i++ ) {
-               ve.test.utils.runSurfaceHandleDeleteTest(
+               ve.test.utils.runSurfaceHandleSpecialKeyTest(
                        assert, cases[i].html, cases[i].range, 
cases[i].operations,
                        cases[i].expectedData, cases[i].expectedRange, 
cases[i].msg
                );
@@ -604,7 +605,6 @@
 // TODO: ve.ce.Surface#handleUpOrDownArrowKey
 // TODO: ve.ce.Surface#handleInsertion
 // TODO: ve.ce.Surface#handleEnter
-// TODO: ve.ce.Surface#handleDelete
 // TODO: ve.ce.Surface#showSelection
 // TODO: ve.ce.Surface#replacePhantoms
 // TODO: ve.ce.Surface#replaceHighlight

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7489bf2d20fa17b1c164ff20e0cfcd9b9d5102d2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: jenkins-bot

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