From: Krinkle <krinkle@users.mediawiki.org>
Date: Mon, 13 Feb 2012 15:13:09 +0000 (+0000)
Subject: [JSTesting] Follow-up r110619: Fix introduced race-condition
X-Git-Tag: 1.31.0-rc.0~24735
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=d956040d0885d9d5399e06d3b2d2e5962a45d1da;p=lhc%2Fweb%2Fwiklou.git

[JSTesting] Follow-up r110619: Fix introduced race-condition
- mediawiki.util has dependencies as well, load order is important.
- This index.html is very hairy and most people should just ignore it, it predates the automated ResourceLoader-ified Special:JavaScriptTesting page, hence the manual dependency resolution here.
---

diff --git a/tests/qunit/index.html b/tests/qunit/index.html
index ef7ff8dea9..913c1b2de3 100644
--- a/tests/qunit/index.html
+++ b/tests/qunit/index.html
@@ -53,17 +53,15 @@
 	<script src="../../resources/jquery/jquery.js"></script>
 	<script src="../../resources/mediawiki/mediawiki.js"></script>
 
-	<!-- MW: mediawiki.page.startup -->
+	<!-- MW: mediawiki.user|mediawiki.util|mediawiki.page.startup|mediawiki.page.ready -->
 	<script src="../../resources/jquery/jquery.client.js"></script>
-	<script src="../../resources/mediawiki/mediawiki.util.js"></script>
-	<script src="../../resources/mediawiki.page/mediawiki.page.startup.js"></script>
-
-	<!-- MW: mediawiki.user|mediawiki.page.ready -->
 	<script src="../../resources/jquery/jquery.cookie.js"></script>
 	<script src="../../resources/mediawiki/mediawiki.user.js"></script>
 
 	<script src="../../resources/jquery/jquery.messageBox.js"></script>
 	<script src="../../resources/jquery/jquery.mwExtension.js"></script>
+	<script src="../../resources/mediawiki/mediawiki.util.js"></script>
+	<script src="../../resources/mediawiki.page/mediawiki.page.startup.js"></script>
 
 	<script src="../../resources/jquery/jquery.checkboxShiftClick.js"></script>
 	<script src="../../resources/jquery/jquery.makeCollapsible.js"></script>