jenkins-bot has submitted this change and it was merged.
Change subject: "Fix" hack in ve.test.utils to prevent immediate surface setup
......................................................................
"Fix" hack in ve.test.utils to prevent immediate surface setup
This used to work because loading i18n files took time. However,
we now don't register any message paths with the platform, so
platform initialization is now synchronous, which breaks the hack.
Instead, explicitly assign an unresolved deferred to the platform's
initialization promise, and resolve it after the mw.Target has been
constructed.
*barf*
Change-Id: I287cb86ce8c4c534fd723532f34463359a8ccc7c
---
M modules/ve-mw/tests/ve.test.utils.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, but someone else must approve
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/tests/ve.test.utils.js
b/modules/ve-mw/tests/ve.test.utils.js
index ba16ce6..92a6083 100644
--- a/modules/ve-mw/tests/ve.test.utils.js
+++ b/modules/ve-mw/tests/ve.test.utils.js
@@ -7,12 +7,13 @@
ve.test.utils.createSurfaceFromDocument = function ( doc ) {
// Prevent the target from setting up the surface immediately
- ve.init.platform.initialized = null;
+ ve.init.platform.initialized = $.Deferred();
// HACK: MW targets are async and heavy, use an SA target but
// override the global registration
var target = new ve.init.sa.Target( $( '#qunit-fixture' ), doc ),
mwTarget = new ve.init.mw.Target( $( '<div>' ).appendTo( $(
'#qunit-fixture' ) ) );
+ ve.init.platform.initialized.resolve();
mwTarget = null;
target.setup( doc );
return target.surface;
--
To view, visit https://gerrit.wikimedia.org/r/153875
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I287cb86ce8c4c534fd723532f34463359a8ccc7c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: 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
