Title: Refactor JS/CSS page handling to be more sane

[lhc/web/wiklou.git] / tests / phpunit / includes / TitleMethodsTest.php

diff --git a/tests/phpunit/includes/TitleMethodsTest.php b/tests/phpunit/includes/TitleMethodsTest.php
index f4eb6bf..9ae84d9 100644 (file)
--- 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 ],
@@ -173,6 +173,8 @@ class TitleMethodsTest extends MediaWikiLangTestCase {
                        [ 'User:Foo.js', false ],
                        [ 'User:Foo/bar.js', false ],
                        [ 'User:Foo/bar.css', false ],
+                       [ 'User:Foo/bar.JS', false ],
+                       [ 'User:Foo/bar.CSS', false ],
                        [ 'User talk:Foo/bar.css', false ],
                        [ 'User:Foo/bar.js.xxx', false ],
                        [ 'User:Foo/bar.xxx', false ],
@@ -180,6 +182,7 @@ class TitleMethodsTest extends MediaWikiLangTestCase {
                        [ 'MediaWiki:Foo.css', true ],
                        [ 'MediaWiki:Foo.JS', 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 +190,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,28 +206,32 @@ class TitleMethodsTest extends MediaWikiLangTestCase {
                        [ 'User:Foo', false ],
                        [ 'User:Foo.js', false ],
                        [ 'User:Foo/bar.js', true ],
+                       [ 'User:Foo/bar.JS', 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.css', false ],
+                       [ 'MediaWiki:Foo.JS', 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 ],
@@ -237,33 +244,35 @@ class TitleMethodsTest extends MediaWikiLangTestCase {
        }
 
        /**
-        * @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() {
@@ -279,13 +288,14 @@ class TitleMethodsTest extends MediaWikiLangTestCase {
                        [ '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.CSS', true ],
+                       [ 'MediaWiki:Foo.css', false ],
+                       [ 'MediaWiki:Foo.JS', 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 ],
                ];
        }