Merge "Title: Title::getSubpage should not lose the interwiki prefix"

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

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
index 0ea4e2b..60b4073 100644 (file)
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
@@ -56,7 +56,7 @@ class ResourceLoaderModuleTest extends ResourceLoaderTestCase {
                );
 
                // Subclass
-               $module = new ResourceLoaderFileModuleTestModule( $baseParams );
+               $module = new ResourceLoaderFileModuleTestingSubclass( $baseParams );
                $this->assertNotEquals(
                        $version,
                        json_encode( $module->getVersionHash( $context ) ),
@@ -64,6 +64,19 @@ class ResourceLoaderModuleTest extends ResourceLoaderTestCase {
                );
        }
 
+       /**
+        * @covers ResourceLoaderModule::getVersionHash
+        */
+       public function testGetVersionHash_parentDefinition() {
+               $context = $this->getResourceLoaderContext();
+               $module = $this->getMockBuilder( ResourceLoaderModule::class )
+                       ->setMethods( [ 'getDefinitionSummary' ] )->getMock();
+               $module->method( 'getDefinitionSummary' )->willReturn( [ 'a' => 'summary' ] );
+
+               $this->setExpectedException( LogicException::class, 'must call parent' );
+               $module->getVersionHash( $context );
+       }
+
        /**
         * @covers ResourceLoaderModule::validateScriptFile
         */
@@ -73,6 +86,7 @@ class ResourceLoaderModuleTest extends ResourceLoaderTestCase {
                $context = $this->getResourceLoaderContext();
 
                $module = new ResourceLoaderTestModule( [
+                       'mayValidateScript' => true,
                        'script' => "var a = 'this is';\n {\ninvalid"
                ] );
                $this->assertEquals(
@@ -138,8 +152,8 @@ class ResourceLoaderModuleTest extends ResourceLoaderTestCase {
                ] );
                $this->assertEquals( $raw, $module->getScript( $context ), 'Raw script' );
                $this->assertEquals(
-                       [ 'scripts' => $build ],
-                       $module->getModuleContent( $context ),
+                       $build,
+                       $module->getModuleContent( $context )[ 'scripts' ],
                        $message
                );
        }