Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92762
Change subject: ResourcesTest: Assert no @media is used inside
'media'-specified resources
......................................................................
ResourcesTest: Assert no @media is used inside 'media'-specified resources
Change-Id: I85d652da7c1713d46a5085b9fde7fb24045348be
---
M tests/phpunit/structure/ResourcesTest.php
1 file changed, 87 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/62/92762/1
diff --git a/tests/phpunit/structure/ResourcesTest.php
b/tests/phpunit/structure/ResourcesTest.php
index fe823fa..32cd797 100644
--- a/tests/phpunit/structure/ResourcesTest.php
+++ b/tests/phpunit/structure/ResourcesTest.php
@@ -26,26 +26,97 @@
}
/**
- * This ask the ResouceLoader for all registered files from modules
- * created by ResourceLoaderFileModule (or one of its descendants).
- *
+ * @dataProvider provideMediaStylesheets
+ */
+ public function testStyleMedia( $moduleName, $media, $filename, $css ) {
+ $cssText = trim( $css->cssText );
+
+ $this->assertTrue( strpos( $cssText, '@media' ) === false,
'Stylesheets should not both specify "media" and contain @media' );
+ }
+
+ /**
+ * Get all registered modules from ResouceLoader.
+ */
+ protected static function getAllModules() {
+ global $wgEnableJavaScriptTest;
+
+ // Test existance of test suite files as well
+ // (can't use setUp or setMwGlobals because providers are
static)
+ $org_wgEnableJavaScriptTest = $wgEnableJavaScriptTest;
+ $wgEnableJavaScriptTest = true;
+
+ // Initialize ResourceLoader
+ $rl = new ResourceLoader();
+
+ $modules = array();
+
+ foreach ( $rl->getModuleNames() as $moduleName ) {
+ $modules[$moduleName] = $rl->getModule( $moduleName );
+ }
+
+ // Restore settings
+ $wgEnableJavaScriptTest = $org_wgEnableJavaScriptTest;
+
+ return array(
+ 'modules' => $modules,
+ 'resourceloader' => $rl,
+ 'context' => new ResourceLoaderContext( $rl, new
FauxRequest() )
+ );
+ }
+
+ /**
+ * Get all stylesheet files from modules that are an instance of
+ * ResourceLoaderFileModule (or one of its subclasses).
+ */
+ public static function provideMediaStylesheets() {
+ $data = self::getAllModules();
+ $cases = array();
+
+ foreach ( $data['modules'] as $moduleName => $module ) {
+ if ( !$module instanceof ResourceLoaderFileModule ) {
+ continue;
+ }
+
+ $reflectedModule = new ReflectionObject( $module );
+
+ $getStyleFiles = $reflectedModule->getMethod(
'getStyleFiles' );
+ $getStyleFiles->setAccessible( true );
+
+ $readStyleFile = $reflectedModule->getMethod(
'readStyleFile' );
+ $readStyleFile->setAccessible( true );
+
+ $styleFiles = $getStyleFiles->invoke( $module,
$data['context'] );
+
+ $flip = $module->getFlip( $data['context'] );
+
+ foreach ( $styleFiles as $media => $files ) {
+ if ( $media && $media !== 'all' ) {
+ foreach ( $files as $file ) {
+ $cases[] = array(
+ $moduleName,
+ $media,
+ $file,
+ // XXX: Wrapped in an
object to keep it out of PHPUnit output
+ (object) array(
'cssText' => $readStyleFile->invoke( $module, $file, $flip ) ),
+ );
+ }
+ }
+ }
+ }
+
+ return $cases;
+ }
+
+ /**
+ * Get all resource files from modules that are an instance of
+ * ResourceLoaderFileModule (or one of its subclasses).
*
* Since the raw data is stored in protected properties, we have to
* overrride this through ReflectionObject methods.
*/
public static function provideResourceFiles() {
- global $wgEnableJavaScriptTest;
-
- // Test existance of test suite files as well
- // (can't use setUp or setMwGlobals because providers are
static)
- $live_wgEnableJavaScriptTest = $wgEnableJavaScriptTest;
- $wgEnableJavaScriptTest = true;
-
- // Array with arguments for the test function
+ $data = self::getAllModules();
$cases = array();
-
- // Initialize ResourceLoader
- $rl = new ResourceLoader();
// See also ResourceLoaderFileModule::__construct
$filePathProps = array(
@@ -65,8 +136,7 @@
),
);
- foreach ( $rl->getModuleNames() as $moduleName ) {
- $module = $rl->getModule( $moduleName );
+ foreach ( $data['modules'] as $moduleName => $module ) {
if ( !$module instanceof ResourceLoaderFileModule ) {
continue;
}
@@ -117,14 +187,12 @@
foreach ( $files as $file ) {
$cases[] = array(
$method->invoke( $module, $file ),
- $module->getName(),
+ $moduleName,
$file,
);
}
}
- // Restore settings
- $wgEnableJavaScriptTest = $live_wgEnableJavaScriptTest;
return $cases;
}
--
To view, visit https://gerrit.wikimedia.org/r/92762
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I85d652da7c1713d46a5085b9fde7fb24045348be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
