jenkins-bot has submitted this change and it was merged.
Change subject: Back out "Re-use example surface across surface view tests"
......................................................................
Back out "Re-use example surface across surface view tests"
Back out 14a0f114de0eb9916785cdb560159279ea8d0e42 , as it can cause unit test
failures that are difficult to debug (e.g. failure when all tests are run, but
success when the failed test is re-run).
Change-Id: I4808d0df065de72f1fae4746ad848c1b3630bb0a
---
M tests/ce/ve.ce.Surface.test.js
1 file changed, 2 insertions(+), 10 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/ce/ve.ce.Surface.test.js b/tests/ce/ve.ce.Surface.test.js
index 5111d01..977fced 100644
--- a/tests/ce/ve.ce.Surface.test.js
+++ b/tests/ce/ve.ce.Surface.test.js
@@ -8,8 +8,6 @@
/* Tests */
-ve.test.utils.exampleSurface = ve.test.utils.createSurfaceViewFromDocument(
ve.dm.example.createExampleDocument() );
-
ve.test.utils.runSurfaceHandleSpecialKeyTest = function ( assert, html, range,
operations, expectedData, expectedSelection, msg ) {
var i, method, args, selection,
actions = {
@@ -22,7 +20,7 @@
},
view = html ?
ve.test.utils.createSurfaceViewFromHtml( html ) :
- ve.test.utils.exampleSurface,
+ ve.test.utils.createSurfaceViewFromDocument(
ve.dm.example.createExampleDocument() ),
model = view.getModel(),
data = ve.copy( model.getDocument().getFullData() );
@@ -44,13 +42,7 @@
assert.equalLinearData( model.getDocument().getFullData(), data, msg +
': data' );
assert.deepEqual( selection.toJSON(), expectedSelection, msg + ':
selection' );
- if ( view === ve.test.utils.exampleSurface ) {
- while ( model.hasBeenModified() ) {
- model.undo();
- }
- } else {
- view.destroy();
- }
+ view.destroy();
};
QUnit.test( 'handleLinearDelete', function ( assert ) {
--
To view, visit https://gerrit.wikimedia.org/r/236023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4808d0df065de72f1fae4746ad848c1b3630bb0a
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec <[email protected]>
Gerrit-Reviewer: Divec <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
