From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 tests/phpunit/includes/libs/JavaScriptMinifierTest.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'tests/phpunit/includes/libs/JavaScriptMinifierTest.php')

diff --git a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
index c8795b2e..149a28c1 100644
--- a/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
+++ b/tests/phpunit/includes/libs/JavaScriptMinifierTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class JavaScriptMinifierTest extends MediaWikiTestCase {
+class JavaScriptMinifierTest extends PHPUnit_Framework_TestCase {
 
 	public static function provideCases() {
 		return array(
@@ -164,7 +164,7 @@ class JavaScriptMinifierTest extends MediaWikiTestCase {
 		);
 	}
 
-	public static function provideBug32548() {
+	public static function provideExponentLineBreaking() {
 		return array(
 			array(
 				// This one gets interpreted all together by the prior code;
@@ -183,14 +183,13 @@ class JavaScriptMinifierTest extends MediaWikiTestCase {
 	}
 
 	/**
-	 * @dataProvider provideBug32548
+	 * @dataProvider provideExponentLineBreaking
 	 * @covers JavaScriptMinifier::minify
-	 * @todo give this test a real name explaining what is being tested here
 	 */
-	public function testBug32548Exponent( $num ) {
+	public function testExponentLineBreaking( $num ) {
 		// Long line breaking was being incorrectly done between the base and
 		// exponent part of a number, causing a syntax error. The line should
-		// instead break at the start of the number.
+		// instead break at the start of the number. (T34548)
 		$prefix = 'var longVarName' . str_repeat( '_', 973 ) . '=';
 		$suffix = ',shortVarName=0;';
 
-- 
cgit v1.2.3-54-g00ecf