From: Hashar <hashar@free.fr>
Date: Fri, 7 Dec 2012 10:51:16 +0000 (+0000)
Subject: Merge changes Ic85d486d,I95bfb886
X-Git-Tag: 1.31.0-rc.0~21400
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=ace6ceaf484b5e6390be645ef36d85e747bc922e;p=lhc%2Fweb%2Fwiklou.git

Merge changes Ic85d486d,I95bfb886

* changes:
  Rename JavascriptContentTest to JavaScriptContentTest
  Use the canonical class name: s/JavascriptContent/JavaScriptContent/
---

ace6ceaf484b5e6390be645ef36d85e747bc922e
diff --cc tests/TestsAutoLoader.php
index 455479d829,2d4e49b9c4..8373b514c9
--- a/tests/TestsAutoLoader.php
+++ b/tests/TestsAutoLoader.php
@@@ -63,9 -63,8 +63,9 @@@ $wgAutoloadClasses += array
  	'DummyContentHandlerForTesting' => "$testDir/phpunit/includes/content/ContentHandlerTest.php",
  	'DummyContentForTesting' => "$testDir/phpunit/includes/content/ContentHandlerTest.php",
  	'ContentHandlerTest' => "$testDir/phpunit/includes/content/ContentHandlerTest.php",
- 	'JavascriptContentTest' => "$testDir/phpunit/includes/content/JavascriptContentTest.php",
+ 	'JavaScriptContentTest' => "$testDir/phpunit/includes/content/JavaScriptContentTest.php",
  	'TextContentTest' => "$testDir/phpunit/includes/content/TextContentTest.php",
 +	'WikitextContentTest' => "$testDir/phpunit/includes/content/WikitextContentTest.php",
  
  	# tests/phpunit/includes/db
  	'ORMRowTest' => "$testDir/phpunit/includes/db/ORMRowTest.php",