Merge "Add top help link to MediaWiki.org in several pages via indicator"

[lhc/web/wiklou.git] / tests / phpunit / structure / ResourcesTest.php

diff --git a/tests/phpunit/structure/ResourcesTest.php b/tests/phpunit/structure/ResourcesTest.php
index 647386d..16a9f3a 100644 (file)
--- a/tests/phpunit/structure/ResourcesTest.php
+++ b/tests/phpunit/structure/ResourcesTest.php
@@ -45,6 +45,7 @@ class ResourcesTest extends MediaWikiTestCase {
                $data = self::getAllModules();
                $illegalDeps = array( 'jquery', 'mediawiki' );
 
+               /** @var ResourceLoaderModule $module */
                foreach ( $data['modules'] as $moduleName => $module ) {
                        foreach ( $illegalDeps as $illegalDep ) {
                                $this->assertNotContains(
@@ -63,6 +64,7 @@ class ResourcesTest extends MediaWikiTestCase {
                $data = self::getAllModules();
                $validDeps = array_keys( $data['modules'] );
 
+               /** @var ResourceLoaderModule $module */
                foreach ( $data['modules'] as $moduleName => $module ) {
                        foreach ( $module->getDependencies() as $dep ) {
                                $this->assertContains(
@@ -85,9 +87,14 @@ class ResourcesTest extends MediaWikiTestCase {
                $data = self::getAllModules();
                $validDeps = array_keys( $data['modules'] );
 
+               /** @var ResourceLoaderModule $module */
                foreach ( $data['modules'] as $moduleName => $module ) {
                        $moduleTargets = $module->getTargets();
                        foreach ( $module->getDependencies() as $dep ) {
+                               if ( !isset( $data['modules'][$dep] ) ) {
+                                       // Missing dependencies reported by testMissingDependencies
+                                       continue;
+                               }
                                $targets = $data['modules'][$dep]->getTargets();
                                foreach ( $moduleTargets as $moduleTarget ) {
                                        $this->assertContains(
@@ -103,6 +110,7 @@ class ResourcesTest extends MediaWikiTestCase {
 
        /**
         * Get all registered modules from ResouceLoader.
+        * @return array
         */
        protected static function getAllModules() {
                global $wgEnableJavaScriptTest;