*
* @group Output
*
+ * @todo factor tests in this class into providers and test methods
+ *
*/
class OutputPageTest extends MediaWikiTestCase {
const SCREEN_MEDIA_QUERY = 'screen and (min-width: 982px)';
*
* options['printableQuery'] - value of query string for printable, or omitted for none
* options['handheldQuery'] - value of query string for handheld, or omitted for none
- * options['handheldForIPhone'] - value of the $wgHandheldForIPhone global
* options['media'] - passed into the method under the same name
* options['expectedReturn'] - expected return value
* options['message'] - PHPUnit message for assertion
}
$fauxRequest = new FauxRequest( $queryData, false );
- $this->setMWGlobals( array(
+ $this->setMwGlobals( array(
'wgRequest' => $fauxRequest,
- 'wgHandheldForIPhone' => $args['handheldForIPhone']
) );
$actualReturn = OutputPage::transformCssMedia( $args['media'] );
$this->assertSame( $args['expectedReturn'], $actualReturn, $args['message'] );
}
- /**
- * Tests a case of transformCssMedia with both values of wgHandheldForIPhone.
- * Used to verify that behavior is orthogonal to that option.
- *
- * If the value of wgHandheldForIPhone should matter, use assertTransformCssMediaCase.
- *
- * @param array $args key-value array of arguments as shown in assertTransformCssMediaCase.
- * Will be mutated.
- */
- protected function assertTransformCssMediaCaseWithBothHandheldForIPhone( $args ) {
- $message = $args['message'];
- foreach ( array( true, false ) as $handheldForIPhone ) {
- $args['handheldForIPhone'] = $handheldForIPhone;
- $stringHandheldForIPhone = var_export( $handheldForIPhone, true );
- $args['message'] = "$message. \$wgHandheldForIPhone was $stringHandheldForIPhone";
- $this->assertTransformCssMediaCase( $args );
- }
- }
-
/**
* Tests print requests
+ * @covers OutputPage::transformCssMedia
*/
public function testPrintRequests() {
- $this->assertTransformCssMediaCaseWithBothHandheldForIPhone( array(
+ $this->assertTransformCssMediaCase( array(
'printableQuery' => '1',
'media' => 'screen',
'expectedReturn' => null,
'message' => 'On printable request, screen returns null'
) );
- $this->assertTransformCssMediaCaseWithBothHandheldForIPhone( array(
+ $this->assertTransformCssMediaCase( array(
'printableQuery' => '1',
'media' => self::SCREEN_MEDIA_QUERY,
'expectedReturn' => null,
'message' => 'On printable request, screen media query returns null'
) );
- $this->assertTransformCssMediaCaseWithBothHandheldForIPhone( array(
+ $this->assertTransformCssMediaCase( array(
'printableQuery' => '1',
'media' => self::SCREEN_ONLY_MEDIA_QUERY,
'expectedReturn' => null,
'message' => 'On printable request, screen media query with only returns null'
) );
- $this->assertTransformCssMediaCaseWithBothHandheldForIPhone( array(
+ $this->assertTransformCssMediaCase( array(
'printableQuery' => '1',
'media' => 'print',
'expectedReturn' => '',
/**
* Tests screen requests, without either query parameter set
+ * @covers OutputPage::transformCssMedia
*/
public function testScreenRequests() {
$this->assertTransformCssMediaCase( array(
- 'handheldForIPhone' => false,
'media' => 'screen',
'expectedReturn' => 'screen',
- 'message' => 'On screen request, with handheldForIPhone false, screen media type is preserved'
+ 'message' => 'On screen request, screen media type is preserved'
) );
- $this->assertTransformCssMediaCaseWithBothHandheldForIPhone( array(
+ $this->assertTransformCssMediaCase( array(
+ 'media' => 'handheld',
+ 'expectedReturn' => 'handheld',
+ 'message' => 'On screen request, handheld media type is preserved'
+ ) );
+
+ $this->assertTransformCssMediaCase( array(
'media' => self::SCREEN_MEDIA_QUERY,
'expectedReturn' => self::SCREEN_MEDIA_QUERY,
'message' => 'On screen request, screen media query is preserved.'
) );
- $this->assertTransformCssMediaCaseWithBothHandheldForIPhone( array(
+ $this->assertTransformCssMediaCase( array(
'media' => self::SCREEN_ONLY_MEDIA_QUERY,
'expectedReturn' => self::SCREEN_ONLY_MEDIA_QUERY,
'message' => 'On screen request, screen media query with only is preserved.'
) );
- $this->assertTransformCssMediaCaseWithBothHandheldForIPhone( array(
+ $this->assertTransformCssMediaCase( array(
'media' => 'print',
'expectedReturn' => 'print',
'message' => 'On screen request, print media type is preserved'
}
/**
- * Tests handheld and wgHandheldForIPhone behavior
+ * Tests handheld behavior
+ * @covers OutputPage::transformCssMedia
*/
public function testHandheld() {
- $this->assertTransformCssMediaCaseWithBothHandheldForIPhone( array(
+ $this->assertTransformCssMediaCase( array(
'handheldQuery' => '1',
'media' => 'handheld',
'expectedReturn' => '',
'message' => 'On request with handheld querystring and media is handheld, returns empty string'
) );
- $this->assertTransformCssMediaCaseWithBothHandheldForIPhone( array(
+ $this->assertTransformCssMediaCase( array(
'handheldQuery' => '1',
'media' => 'screen',
'expectedReturn' => null,
'message' => 'On request with handheld querystring and media is screen, returns null'
) );
+ }
- // A bit counter-intuitively, $wgHandheldForIPhone should only matter if the query handheld is false or omitted
- $this->assertTransformCssMediaCase( array(
- 'handheldQuery' => '0',
- 'media' => 'screen',
- 'handheldForIPhone' => true,
- 'expectedReturn' => 'screen and (min-device-width: 481px)',
- 'message' => 'With $wgHandheldForIPhone true, screen media type is transformed'
- ) );
+ public static function provideMakeResourceLoaderLink() {
+ return array(
+ // Load module script only
+ array(
+ array( 'test.foo', ResourceLoaderModule::TYPE_SCRIPTS ),
+ '<script src="http://127.0.0.1:8080/w/load.php?debug=false&lang=en&modules=test.foo&only=scripts&skin=vector&*"></script>
+'
+ ),
+ // Load module styles only
+ // This also tests the order the modules are put into the url
+ array(
+ array( array( 'test.baz', 'test.foo', 'test.bar' ), ResourceLoaderModule::TYPE_STYLES ),
+ '<link rel=stylesheet href="http://127.0.0.1:8080/w/load.php?debug=false&lang=en&modules=test.bar%2Cbaz%2Cfoo&only=styles&skin=vector&*">
+'
+ ),
+ // Load private module (combined)
+ array(
+ array( 'test.quux', ResourceLoaderModule::TYPE_COMBINED ),
+ '<script>if(window.mw){
+mw.loader.implement("test.quux",function($,jQuery){mw.test.baz({token:123});},{"css":[".mw-icon{transition:none}\n/* cache key: wiki:resourceloader:filter:minify-css:7:fd8ea20b3336b2bfb230c789d430067a */"]},{});
+/* cache key: wiki:resourceloader:filter:minify-js:7:274ccee17be73cd5f4dda5dc2a819188 */
+}</script>
+'
+ ),
+ // Load module script with with ESI
+ array(
+ array( 'test.foo', ResourceLoaderModule::TYPE_SCRIPTS, true ),
+ '<script><esi:include src="http://127.0.0.1:8080/w/load.php?debug=false&lang=en&modules=test.foo&only=scripts&skin=vector&*" /></script>
+'
+ ),
+ // Load module styles with with ESI
+ array(
+ array( 'test.foo', ResourceLoaderModule::TYPE_STYLES, true ),
+ '<style><esi:include src="http://127.0.0.1:8080/w/load.php?debug=false&lang=en&modules=test.foo&only=styles&skin=vector&*" /></style>
+',
+ ),
+ );
+ }
- $this->assertTransformCssMediaCase( array(
- 'media' => 'handheld',
- 'handheldForIPhone' => true,
- 'expectedReturn' => 'handheld, only screen and (max-device-width: 480px)',
- 'message' => 'With $wgHandheldForIPhone true, handheld media type is transformed'
+ /**
+ * @dataProvider provideMakeResourceLoaderLink
+ * @covers OutputPage::makeResourceLoaderLink
+ */
+ public function testMakeResourceLoaderLink( $args, $expectedHtml ) {
+ $this->setMwGlobals( array(
+ 'wgResourceLoaderDebug' => false,
+ 'wgResourceLoaderUseESI' => true,
+ 'wgLoadScript' => 'http://127.0.0.1:8080/w/load.php',
+ // Affects whether CDATA is inserted
+ 'wgWellFormedXml' => false,
+ // Cache key is based on database name, and affects output;
+ // this test should not touch the database anyways.
+ 'wgDBname' => 'wiki',
+ 'wgDBprefix' => '',
) );
-
- $this->assertTransformCssMediaCase( array(
- 'media' => 'handheld',
- 'handheldForIPhone' => false,
- 'expectedReturn' => 'handheld',
- 'message' => 'With $wgHandheldForIPhone false, handheld media type is preserved'
+ $class = new ReflectionClass( 'OutputPage' );
+ $method = $class->getMethod( 'makeResourceLoaderLink' );
+ $method->setAccessible( true );
+ $ctx = new RequestContext();
+ $ctx->setSkin( Skin::newFromKey( 'vector' ) );
+ $ctx->setLanguage( 'en' );
+ $out = new OutputPage( $ctx );
+ $rl = $out->getResourceLoader();
+ $rl->register( array(
+ 'test.foo' => new ResourceLoaderTestModule( array(
+ 'script' => 'mw.test.foo( { a: true } );',
+ 'styles' => '.mw-test-foo { content: "style"; }',
+ )),
+ 'test.bar' => new ResourceLoaderTestModule( array(
+ 'script' => 'mw.test.bar( { a: true } );',
+ 'styles' => '.mw-test-bar { content: "style"; }',
+ )),
+ 'test.baz' => new ResourceLoaderTestModule( array(
+ 'script' => 'mw.test.baz( { a: true } );',
+ 'styles' => '.mw-test-baz { content: "style"; }',
+ )),
+ 'test.quux' => new ResourceLoaderTestModule( array(
+ 'script' => 'mw.test.baz( { token: 123 } );',
+ 'styles' => '/* pref-animate=off */ .mw-icon { transition: none; }',
+ 'group' => 'private',
+ )),
) );
+ $links = $method->invokeArgs( $out, $args );
+ $this->assertEquals( $expectedHtml, $links['html'] );
}
}
dépôts / lhc / web / wiklou.git / blobdiff