jenkins-bot has submitted this change and it was merged.
Change subject: Run UnicodeJS tests from Special:JavaScriptTest/qunit
......................................................................
Run UnicodeJS tests from Special:JavaScriptTest/qunit
Previously they were only run from the dedicated standalone test
which meant they weren't being run from Jenkins.
Change-Id: If22456f0031c68b0c1e7621b35b1e79c0664da15
---
M VisualEditor.hooks.php
M modules/unicodejs/index.php
2 files changed, 10 insertions(+), 2 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 7991879..e3795bc 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -170,6 +170,10 @@
've-mw/test/mw-preload.js',
// QUnit plugin
've/test/ve.qunit.js',
+ // UnicodeJS Tests
+ 'unicodejs/test/unicodejs.test.js',
+
'unicodejs/test/unicodejs.graphemebreak.test.js',
+ 'unicodejs/test/unicodejs.wordbreak.test.js',
// VisualEditor Tests
've/test/ve.test.utils.js',
've/test/ve.test.js',
@@ -228,6 +232,7 @@
've-mw/test/init/targets/ve.init.mw.ViewPageTarget.test.js',
),
'dependencies' => array(
+ 'unicodejs.wordbreak',
'ext.visualEditor.standalone',
'ext.visualEditor.core',
'ext.visualEditor.experimental',
diff --git a/modules/unicodejs/index.php b/modules/unicodejs/index.php
index b6d3fd9..2c157c1 100644
--- a/modules/unicodejs/index.php
+++ b/modules/unicodejs/index.php
@@ -13,12 +13,14 @@
<meta charset="UTF-8">
<title>UnicodeJS Tests</title>
- <!-- Load test framework -->
+ <!-- Test framework -->
<link rel="stylesheet" href="../qunit/qunit.css">
<script src="../qunit/qunit.js"></script>
- <!-- Dependencies -->
+ <!-- Code Dependencies -->
<script src="../jquery/jquery.js"></script>
+
+ <!-- Code -->
<script src="unicodejs.js"></script>
<script src="unicodejs.textstring.js"></script>
<script src="unicodejs.graphemebreakproperties.js"></script>
@@ -26,6 +28,7 @@
<script src="unicodejs.wordbreakproperties.js"></script>
<script src="unicodejs.wordbreak.js"></script>
+ <!-- Code Tests (also update
VisualEditorHooks::onResourceLoaderTestModules) -->
<script src="test/unicodejs.test.js"></script>
<script src="test/unicodejs.graphemebreak.test.js"></script>
<script src="test/unicodejs.wordbreak.test.js"></script>
--
To view, visit https://gerrit.wikimedia.org/r/74083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If22456f0031c68b0c1e7621b35b1e79c0664da15
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
