Merge "Add a preference to require email for password resets"

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

diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php
index 448eec8..aa6e494 100644 (file)
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -2537,35 +2537,42 @@ class OutputPageTest extends MediaWikiTestCase {
                $rl = $out->getResourceLoader();
                $rl->setMessageBlobStore( $this->createMock( MessageBlobStore::class ) );
                $rl->register( [
-                       'test.foo' => new ResourceLoaderTestModule( [
+                       'test.foo' => [
+                               'class' => ResourceLoaderTestModule::class,
                                'script' => 'mw.test.foo( { a: true } );',
                                'styles' => '.mw-test-foo { content: "style"; }',
-                       ] ),
-                       'test.bar' => new ResourceLoaderTestModule( [
+                       ],
+                       'test.bar' => [
+                               'class' => ResourceLoaderTestModule::class,
                                'script' => 'mw.test.bar( { a: true } );',
                                'styles' => '.mw-test-bar { content: "style"; }',
-                       ] ),
-                       'test.baz' => new ResourceLoaderTestModule( [
+                       ],
+                       'test.baz' => [
+                               'class' => ResourceLoaderTestModule::class,
                                'script' => 'mw.test.baz( { a: true } );',
                                'styles' => '.mw-test-baz { content: "style"; }',
-                       ] ),
-                       'test.quux' => new ResourceLoaderTestModule( [
+                       ],
+                       'test.quux' => [
+                               'class' => ResourceLoaderTestModule::class,
                                'script' => 'mw.test.baz( { token: 123 } );',
                                'styles' => '/* pref-animate=off */ .mw-icon { transition: none; }',
                                'group' => 'private',
-                       ] ),
-                       'test.noscript' => new ResourceLoaderTestModule( [
+                       ],
+                       'test.noscript' => [
+                               'class' => ResourceLoaderTestModule::class,
                                'styles' => '.stuff { color: red; }',
                                'group' => 'noscript',
-                       ] ),
-                       'test.group.foo' => new ResourceLoaderTestModule( [
+                       ],
+                       'test.group.foo' => [
+                               'class' => ResourceLoaderTestModule::class,
                                'script' => 'mw.doStuff( "foo" );',
                                'group' => 'foo',
-                       ] ),
-                       'test.group.bar' => new ResourceLoaderTestModule( [
+                       ],
+                       'test.group.bar' => [
+                               'class' => ResourceLoaderTestModule::class,
                                'script' => 'mw.doStuff( "bar" );',
                                'group' => 'bar',
-                       ] ),
+                       ],
                ] );
                $links = $method->invokeArgs( $out, $args );
                $actualHtml = strval( $links );
@@ -2599,7 +2606,7 @@ class OutputPageTest extends MediaWikiTestCase {
                        [
                                [ 'test.quux', ResourceLoaderModule::TYPE_COMBINED ],
                                "<script nonce=\"secret\">(RLQ=window.RLQ||[]).push(function(){"
-                                       . "mw.loader.implement(\"test.quux@1ev0ijv\",function($,jQuery,require,module){"
+                                       . "mw.loader.implement(\"test.quux@1ev0i\",function($,jQuery,require,module){"
                                        . "mw.test.baz({token:123});},{\"css\":[\".mw-icon{transition:none}"
                                        . "\"]});});</script>"
                        ],
@@ -2648,21 +2655,23 @@ class OutputPageTest extends MediaWikiTestCase {
                        ->setConstructorArgs( [ $ctx ] )
                        ->setMethods( [ 'buildCssLinksArray' ] )
                        ->getMock();
-               $op->expects( $this->any() )
-                       ->method( 'buildCssLinksArray' )
+               $op->method( 'buildCssLinksArray' )
                        ->willReturn( [] );
                $rl = $op->getResourceLoader();
                $rl->setMessageBlobStore( $this->createMock( MessageBlobStore::class ) );
 
                // Register custom modules
                $rl->register( [
-                       'example.site.a' => new ResourceLoaderTestModule( [ 'group' => 'site' ] ),
-                       'example.site.b' => new ResourceLoaderTestModule( [ 'group' => 'site' ] ),
-                       'example.user' => new ResourceLoaderTestModule( [ 'group' => 'user' ] ),
+                       'example.site.a' => [ 'class' => ResourceLoaderTestModule::class, 'group' => 'site' ],
+                       'example.site.b' => [ 'class' => ResourceLoaderTestModule::class, 'group' => 'site' ],
+                       'example.user' => [ 'class' => ResourceLoaderTestModule::class, 'group' => 'user' ],
                ] );
 
                $op = TestingAccessWrapper::newFromObject( $op );
                $op->rlExemptStyleModules = $exemptStyleModules;
+               $expect = strtr( $expect, [
+                       '{blankCombi}' => ResourceLoaderTestCase::BLANK_COMBI,
+               ] );
                $this->assertEquals(
                        $expect,
                        strval( $op->buildExemptModules() )
@@ -2689,7 +2698,7 @@ class OutputPageTest extends MediaWikiTestCase {
                                'exemptStyleModules' => [ 'site' => [ 'site.styles' ], 'user' => [ 'user.styles' ] ],
                                '<meta name="ResourceLoaderDynamicStyles" content=""/>' . "\n" .
                                '<link rel="stylesheet" href="/w/load.php?lang=en&amp;modules=site.styles&amp;only=styles"/>' . "\n" .
-                               '<link rel="stylesheet" href="/w/load.php?lang=en&amp;modules=user.styles&amp;only=styles&amp;version=1ai9g6t"/>',
+                               '<link rel="stylesheet" href="/w/load.php?lang=en&amp;modules=user.styles&amp;only=styles&amp;version=15pue"/>',
                        ],
                        'custom modules' => [
                                'exemptStyleModules' => [
@@ -2699,8 +2708,8 @@ class OutputPageTest extends MediaWikiTestCase {
                                '<meta name="ResourceLoaderDynamicStyles" content=""/>' . "\n" .
                                '<link rel="stylesheet" href="/w/load.php?lang=en&amp;modules=example.site.a%2Cb&amp;only=styles"/>' . "\n" .
                                '<link rel="stylesheet" href="/w/load.php?lang=en&amp;modules=site.styles&amp;only=styles"/>' . "\n" .
-                               '<link rel="stylesheet" href="/w/load.php?lang=en&amp;modules=example.user&amp;only=styles&amp;version=0a56zyi"/>' . "\n" .
-                               '<link rel="stylesheet" href="/w/load.php?lang=en&amp;modules=user.styles&amp;only=styles&amp;version=1ai9g6t"/>',
+                               '<link rel="stylesheet" href="/w/load.php?lang=en&amp;modules=example.user&amp;only=styles&amp;version={blankCombi}"/>' . "\n" .
+                               '<link rel="stylesheet" href="/w/load.php?lang=en&amp;modules=user.styles&amp;only=styles&amp;version=15pue"/>',
                        ],
                ];
                // phpcs:enable
@@ -3023,6 +3032,35 @@ class OutputPageTest extends MediaWikiTestCase {
                ];
        }
 
+       /**
+        * @param int $titleLastRevision Last Title revision to set
+        * @param int $outputRevision Revision stored in OutputPage
+        * @param bool $expectedResult Expected result of $output->isRevisionCurrent call
+        * @covers OutputPage::isRevisionCurrent
+        * @dataProvider provideIsRevisionCurrent
+        */
+       public function testIsRevisionCurrent( $titleLastRevision, $outputRevision, $expectedResult ) {
+               $titleMock = $this->getMock( Title::class, [], [], '', false );
+               $titleMock->expects( $this->any() )
+                       ->method( 'getLatestRevID' )
+                       ->willReturn( $titleLastRevision );
+
+               $output = $this->newInstance( [], null, [ 'notitle' => true ] );
+               $output->setTitle( $titleMock );
+               $output->setRevisionId( $outputRevision );
+               $this->assertEquals( $expectedResult, $output->isRevisionCurrent() );
+       }
+
+       public function provideIsRevisionCurrent() {
+               return [
+                       [ 10, null, true ],
+                       [ 42, 42, true ],
+                       [ null, 0, true ],
+                       [ 42, 47, false ],
+                       [ 47, 42, false ]
+               ];
+       }
+
        /**
         * @return OutputPage
         */