Merge "Selenium: replace UserLoginPage with BlankPage where possible"

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

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderOOUIImageModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderOOUIImageModuleTest.php
index 30e9f30..5df52bc 100644 (file)
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderOOUIImageModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderOOUIImageModuleTest.php
@@ -16,26 +16,18 @@ class ResourceLoaderOOUIImageModuleTest extends ResourceLoaderTestCase {
                ] );
 
                // Pretend that 'fakemonobook' is a real skin using the Apex theme
-               SkinFactory::getDefaultInstance()->register(
+               $skinFactory = new SkinFactory();
+               $skinFactory->register(
                        'fakemonobook',
                        'FakeMonoBook',
                        function () {
                        }
                );
-               $r = new ReflectionMethod( ExtensionRegistry::class, 'exportExtractedData' );
-               $r->setAccessible( true );
-               $r->invoke( ExtensionRegistry::getInstance(), [
-                       'globals' => [],
-                       'defines' => [],
-                       'callbacks' => [],
-                       'credits' => [],
-                       'autoloaderPaths' => [],
-                       'attributes' => [
-                               'SkinOOUIThemes' => [
-                                       'fakemonobook' => 'Apex',
-                               ],
-                       ],
-               ] );
+               $this->setService( 'SkinFactory', $skinFactory );
+
+               $reset = ExtensionRegistry::getInstance()->setAttributeForTest(
+                       'SkinOOUIThemes', [ 'fakemonobook' => 'Apex' ]
+               );
 
                $styles = $module->getStyles( $this->getResourceLoaderContext( [ 'skin' => 'fakemonobook' ] ) );
                $this->assertRegExp(