From 343be6a82ea5d18c8aa7a98e24c99490cd43112f Mon Sep 17 00:00:00 2001
From: Krinkle <krinkle@users.mediawiki.org>
Date: Mon, 24 Jan 2011 21:22:57 +0000
Subject: [PATCH] moving tests to the mediawiki.util section + note about order

---
 .../mediawiki.util/mediawiki.util.test.js     | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/resources/mediawiki.util/mediawiki.util.test.js b/resources/mediawiki.util/mediawiki.util.test.js
index 33e2118ac4..c6be185638 100644
--- a/resources/mediawiki.util/mediawiki.util.test.js
+++ b/resources/mediawiki.util/mediawiki.util.test.js
@@ -1,7 +1,7 @@
 /**
  * mediaWiki JavaScript library test suite
  *
- * Available on "/Special:BlankPage?action=mwutiltest&debug=true")
+ * Available on Special:BlankPage?action=mwutiltest&debug=true
  *
  * @author Krinkle <krinklemail@gmail.com>
  */
@@ -82,6 +82,8 @@
 						mw.test.$table = $( 'table#mw-mwutiltest-table' );
 
 						/* Populate tests */
+						// Try to roughly keep the order similar to the order in the files
+						// or alphabetical (depending on the context)
 
 						// Main modules and their aliases
 						mw.test.addHead( 'Main modules and their aliases' );
@@ -264,6 +266,13 @@
 						mw.test.addTest( 'mw.util.jsMessage( mw.config.get( "wgSiteName" ) + " is <b>Awesome</b>." )',
 							'true (boolean)' );
 
+						// TODO: Import tests from PHPUnit test suite for user::isValidEmailAddr
+						mw.test.addTest( 'mw.util.validateEmail( "" )',
+							'null (object)' );
+
+						mw.test.addTest( 'mw.util.validateEmail( "user@localhost" )',
+							'true (boolean)' );
+
 						// jQuery plugins
 						mw.test.addHead( 'jQuery plugins' );
 
@@ -279,16 +288,6 @@
 						mw.test.addTest( 'typeof $.fn.makeCollapsible',
 							'function (string)' );
 
-						// Email validation
-						// TODO: import tests from PHPUnit test suite
-						mw.test.addHead( 'Email validation' );
-
-						mw.test.addTest( 'mw.util.validateEmail( "" )',
-							'null (object)' );
-
-						mw.test.addTest( 'mw.util.validateEmail( "user@localhost" )',
-							'true (boolean)' );
-
 						// Run tests and compare results
 						var	exec,
 							result,
-- 
2.20.1