Merge "resourceloader: Add unit test to ensure absence of illegal dependencies"

diff --git a/resources/Resources.php b/resources/Resources.php
index 00251ef..642897c 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -373,7 +373,6 @@ return array(
                                'resources/src/jquery.ui-themes/vector/jquery.ui.theme.css',
                        ),
                ),
-               'dependencies' => 'jquery',
                'group' => 'jquery.ui',
        ),
        'jquery.ui.widget' => array(
@@ -572,7 +571,6 @@ return array(
        // Effects
        'jquery.effects.core' => array(
                'scripts' => 'resources/lib/jquery.effects/jquery.effects.core.js',
-               'dependencies' => 'jquery',
                'group' => 'jquery.ui',
        ),
        'jquery.effects.blind' => array(

diff --git a/tests/phpunit/structure/ResourcesTest.php b/tests/phpunit/structure/ResourcesTest.php
index cce1b7e..cfcc771 100644 (file)
--- a/tests/phpunit/structure/ResourcesTest.php
+++ b/tests/phpunit/structure/ResourcesTest.php
@@ -34,6 +34,21 @@ class ResourcesTest extends MediaWikiTestCase {
                $this->assertTrue( strpos( $cssText, '@media' ) === false, 'Stylesheets should not both specify "media" and contain @media' );
        }
 
+       public function testDependencies() {
+               $data = self::getAllModules();
+               $illegalDeps = array( 'jquery', 'mediawiki' );
+
+               foreach ( $data['modules'] as $moduleName => $module ) {
+                       foreach ( $illegalDeps as $illegalDep ) {
+                               $this->assertNotContains(
+                                       $illegalDep,
+                                       $module->getDependencies(),
+                                       "Module '$moduleName' must not depend on '$illegalDep'"
+                               );
+                       }
+               }
+       }
+
        /**
         * Get all registered modules from ResouceLoader.
         */

diff --git a/tests/qunit/QUnitTestResources.php b/tests/qunit/QUnitTestResources.php
index 607c435..74ea58e 100644 (file)
--- a/tests/qunit/QUnitTestResources.php
+++ b/tests/qunit/QUnitTestResources.php
@@ -94,7 +94,6 @@ return array(
                        'jquery.tabIndex',
                        'jquery.tablesorter',
                        'jquery.textSelection',
-                       'mediawiki',
                        'mediawiki.api',
                        'mediawiki.api.parse',
                        'mediawiki.api.watch',