X-Git-Url: http://git.cyclocoop.org//%22%22.str_replace%28%27%22%27%2C?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FTitleMethodsTest.php;h=4032b3a1201015a71d80ccc497b0378c9a05534b;hb=2ae7d6b58035f038717d725efd493c4870337599;hp=b760c224891456a6b29f590dd8fd631599387a2d;hpb=732b5e2745ca8f6153e19cc10c3c9acb1b2a6331;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/TitleMethodsTest.php b/tests/phpunit/includes/TitleMethodsTest.php
index b760c22489..4032b3a120 100644
--- a/tests/phpunit/includes/TitleMethodsTest.php
+++ b/tests/phpunit/includes/TitleMethodsTest.php
@@ -164,7 +164,7 @@ class TitleMethodsTest extends MediaWikiLangTestCase {
 		$this->assertTrue( $title->hasContentModel( $expectedModelId ) );
 	}
 
-	public static function provideIsCssOrJsPage() {
+	public static function provideIsSiteConfigPage() {
 		return [
 			[ 'Help:Foo', false ],
 			[ 'Help:Foo.js', false ],
@@ -172,14 +172,21 @@ class TitleMethodsTest extends MediaWikiLangTestCase {
 			[ 'User:Foo', false ],
 			[ 'User:Foo.js', false ],
 			[ 'User:Foo/bar.js', false ],
+			[ 'User:Foo/bar.json', false ],
 			[ 'User:Foo/bar.css', false ],
+			[ 'User:Foo/bar.JS', false ],
+			[ 'User:Foo/bar.JSON', false ],
+			[ 'User:Foo/bar.CSS', false ],
 			[ 'User talk:Foo/bar.css', false ],
 			[ 'User:Foo/bar.js.xxx', false ],
 			[ 'User:Foo/bar.xxx', false ],
 			[ 'MediaWiki:Foo.js', true ],
+			[ 'MediaWiki:Foo.json', true ],
 			[ 'MediaWiki:Foo.css', true ],
 			[ 'MediaWiki:Foo.JS', false ],
+			[ 'MediaWiki:Foo.JSON', false ],
 			[ 'MediaWiki:Foo.CSS', false ],
+			[ 'MediaWiki:Foo/bar.css', true ],
 			[ 'MediaWiki:Foo.css.xxx', false ],
 			[ 'TEST-JS:Foo', false ],
 			[ 'TEST-JS:Foo.js', false ],
@@ -187,15 +194,15 @@ class TitleMethodsTest extends MediaWikiLangTestCase {
 	}
 
 	/**
-	 * @dataProvider provideIsCssOrJsPage
-	 * @covers Title::isCssOrJsPage
+	 * @dataProvider provideIsSiteConfigPage
+	 * @covers Title::isSiteConfigPage
 	 */
-	public function testIsCssOrJsPage( $title, $expectedBool ) {
+	public function testSiteConfigPage( $title, $expectedBool ) {
 		$title = Title::newFromText( $title );
-		$this->assertEquals( $expectedBool, $title->isCssOrJsPage() );
+		$this->assertEquals( $expectedBool, $title->isSiteConfigPage() );
 	}
 
-	public static function provideIsCssJsSubpage() {
+	public static function provideIsUserConfigPage() {
 		return [
 			[ 'Help:Foo', false ],
 			[ 'Help:Foo.js', false ],
@@ -203,67 +210,79 @@ class TitleMethodsTest extends MediaWikiLangTestCase {
 			[ 'User:Foo', false ],
 			[ 'User:Foo.js', false ],
 			[ 'User:Foo/bar.js', true ],
+			[ 'User:Foo/bar.JS', false ],
+			[ 'User:Foo/bar.json', true ],
+			[ 'User:Foo/bar.JSON', false ],
 			[ 'User:Foo/bar.css', true ],
+			[ 'User:Foo/bar.CSS', false ],
 			[ 'User talk:Foo/bar.css', false ],
 			[ 'User:Foo/bar.js.xxx', false ],
 			[ 'User:Foo/bar.xxx', false ],
 			[ 'MediaWiki:Foo.js', false ],
-			[ 'User:Foo/bar.JS', false ],
-			[ 'User:Foo/bar.CSS', false ],
+			[ 'MediaWiki:Foo.json', false ],
+			[ 'MediaWiki:Foo.css', false ],
+			[ 'MediaWiki:Foo.JS', false ],
+			[ 'MediaWiki:Foo.JSON', false ],
+			[ 'MediaWiki:Foo.CSS', false ],
+			[ 'MediaWiki:Foo.css.xxx', false ],
 			[ 'TEST-JS:Foo', false ],
 			[ 'TEST-JS:Foo.js', false ],
 		];
 	}
 
 	/**
-	 * @dataProvider provideIsCssJsSubpage
-	 * @covers Title::isCssJsSubpage
+	 * @dataProvider provideIsUserConfigPage
+	 * @covers Title::isUserConfigPage
 	 */
-	public function testIsCssJsSubpage( $title, $expectedBool ) {
+	public function testIsUserConfigPage( $title, $expectedBool ) {
 		$title = Title::newFromText( $title );
-		$this->assertEquals( $expectedBool, $title->isCssJsSubpage() );
+		$this->assertEquals( $expectedBool, $title->isUserConfigPage() );
 	}
 
-	public static function provideIsCssSubpage() {
+	public static function provideIsUserCssConfigPage() {
 		return [
 			[ 'Help:Foo', false ],
 			[ 'Help:Foo.css', false ],
 			[ 'User:Foo', false ],
 			[ 'User:Foo.js', false ],
+			[ 'User:Foo.json', false ],
 			[ 'User:Foo.css', false ],
 			[ 'User:Foo/bar.js', false ],
+			[ 'User:Foo/bar.json', false ],
 			[ 'User:Foo/bar.css', true ],
 		];
 	}
 
 	/**
-	 * @dataProvider provideIsCssSubpage
-	 * @covers Title::isCssSubpage
+	 * @dataProvider provideIsUserCssConfigPage
+	 * @covers Title::isUserCssConfigPage
 	 */
-	public function testIsCssSubpage( $title, $expectedBool ) {
+	public function testIsUserCssConfigPage( $title, $expectedBool ) {
 		$title = Title::newFromText( $title );
-		$this->assertEquals( $expectedBool, $title->isCssSubpage() );
+		$this->assertEquals( $expectedBool, $title->isUserCssConfigPage() );
 	}
 
-	public static function provideIsJsSubpage() {
+	public static function provideIsUserJsConfigPage() {
 		return [
 			[ 'Help:Foo', false ],
 			[ 'Help:Foo.css', false ],
 			[ 'User:Foo', false ],
 			[ 'User:Foo.js', false ],
+			[ 'User:Foo.json', false ],
 			[ 'User:Foo.css', false ],
 			[ 'User:Foo/bar.js', true ],
+			[ 'User:Foo/bar.json', false ],
 			[ 'User:Foo/bar.css', false ],
 		];
 	}
 
 	/**
-	 * @dataProvider provideIsJsSubpage
-	 * @covers Title::isJsSubpage
+	 * @dataProvider provideIsUserJsConfigPage
+	 * @covers Title::isUserJsConfigPage
 	 */
-	public function testIsJsSubpage( $title, $expectedBool ) {
+	public function testIsUserJsConfigPage( $title, $expectedBool ) {
 		$title = Title::newFromText( $title );
-		$this->assertEquals( $expectedBool, $title->isJsSubpage() );
+		$this->assertEquals( $expectedBool, $title->isUserJsConfigPage() );
 	}
 
 	public static function provideIsWikitextPage() {
@@ -274,18 +293,23 @@ class TitleMethodsTest extends MediaWikiLangTestCase {
 			[ 'User:Foo', true ],
 			[ 'User:Foo.js', true ],
 			[ 'User:Foo/bar.js', false ],
+			[ 'User:Foo/bar.json', false ],
 			[ 'User:Foo/bar.css', false ],
 			[ 'User talk:Foo/bar.css', true ],
 			[ 'User:Foo/bar.js.xxx', true ],
 			[ 'User:Foo/bar.xxx', true ],
 			[ 'MediaWiki:Foo.js', false ],
-			[ 'MediaWiki:Foo.css', false ],
-			[ 'MediaWiki:Foo/bar.css', false ],
 			[ 'User:Foo/bar.JS', true ],
+			[ 'User:Foo/bar.JSON', true ],
 			[ 'User:Foo/bar.CSS', true ],
+			[ 'MediaWiki:Foo.json', false ],
+			[ 'MediaWiki:Foo.css', false ],
+			[ 'MediaWiki:Foo.JS', true ],
+			[ 'MediaWiki:Foo.JSON', true ],
+			[ 'MediaWiki:Foo.CSS', true ],
+			[ 'MediaWiki:Foo.css.xxx', true ],
 			[ 'TEST-JS:Foo', false ],
 			[ 'TEST-JS:Foo.js', false ],
-			[ 'TEST-JS_TALK:Foo.js', true ],
 		];
 	}
 
@@ -318,13 +342,16 @@ class TitleMethodsTest extends MediaWikiLangTestCase {
 	 */
 	public function testGetOtherPage( $text, $expected ) {
 		if ( $expected === null ) {
-			$this->setExpectedException( 'MWException' );
+			$this->setExpectedException( MWException::class );
 		}
 
 		$title = Title::newFromText( $text );
 		$this->assertEquals( $expected, $title->getOtherPage()->getPrefixedText() );
 	}
 
+	/**
+	 * @covers Title::clearCaches
+	 */
 	public function testClearCaches() {
 		$linkCache = LinkCache::singleton();