[MediaWiki-commits] [Gerrit] OutputPageTest: Don't hardcode 'vector' as default skin - change (mediawiki/core)

[Code Review]

Bartosz Dziewoński has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/148766

Change subject: OutputPageTest: Don't hardcode 'vector' as default skin
......................................................................

OutputPageTest: Don't hardcode 'vector' as default skin

Change-Id: Iee465df98616619a3f0023a153e7e3a516cbdbbb
---
M tests/phpunit/includes/OutputPageTest.php
1 file changed, 11 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/66/148766/1

diff --git a/tests/phpunit/includes/OutputPageTest.php 
b/tests/phpunit/includes/OutputPageTest.php
index f68b3b1..7752c6d 100644
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -137,19 +137,22 @@
        }
 
        public static function provideMakeResourceLoaderLink() {
+               global $wgDefaultSkin;
+               $defSkin = Skin::normalizeKey( $wgDefaultSkin );
+
                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&amp;lang=en&amp;modules=test.foo&amp;only=scripts&amp;skin=vector&amp;*";></script>
-'
+                               "<script 
src=\"http://127.0.0.1:8080/w/load.php?debug=false&amp;lang=en&amp;modules=test.foo&amp;only=scripts&amp;skin=$defSkin&amp;*\";></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&amp;lang=en&amp;modules=test.bar%2Cbaz%2Cfoo&amp;only=styles&amp;skin=vector&amp;*";>
-'
+                               "<link rel=stylesheet 
href=\"http://127.0.0.1:8080/w/load.php?debug=false&amp;lang=en&amp;modules=test.bar%2Cbaz%2Cfoo&amp;only=styles&amp;skin=$defSkin&amp;*\";>
+"
                        ),
                        // Load private module (combined)
                        array(
@@ -163,14 +166,14 @@
                        // 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&amp;lang=en&amp;modules=test.foo&amp;only=scripts&amp;skin=vector&amp;*";
 /></script>
-'
+                               "<script><esi:include 
src=\"http://127.0.0.1:8080/w/load.php?debug=false&amp;lang=en&amp;modules=test.foo&amp;only=scripts&amp;skin=$defSkin&amp;*\";
 /></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&amp;lang=en&amp;modules=test.foo&amp;only=styles&amp;skin=vector&amp;*";
 /></style>
-',
+                               "<style><esi:include 
src=\"http://127.0.0.1:8080/w/load.php?debug=false&amp;lang=en&amp;modules=test.foo&amp;only=styles&amp;skin=$defSkin&amp;*\";
 /></style>
+",
                        ),
                );
        }

-- 
To view, visit https://gerrit.wikimedia.org/r/148766
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee465df98616619a3f0023a153e7e3a516cbdbbb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits