[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Allow mw.config and mediaWiki.config in tests

[Fomafix (Code Review)]

Fomafix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/346689 )

Change subject: Allow mw.config and mediaWiki.config in tests
......................................................................

Allow mw.config and mediaWiki.config in tests

This change is needed for I2694d8289d8e154b3aef7b54a23a8a6f114074e3 in core.

Change-Id: Ic2699223e45c2065638fdaf8d87ca470a8fd92d1
---
M client/tests/phpunit/includes/Modules/SiteModuleTest.php
M lib/tests/phpunit/Modules/RepoAccessModuleTest.php
M lib/tests/phpunit/Modules/SitesModuleTest.php
M lib/tests/phpunit/Modules/SitesModuleWorkerTest.php
M repo/tests/phpunit/includes/Modules/MediaWikiConfigModuleTest.php
5 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/89/346689/1

diff --git a/client/tests/phpunit/includes/Modules/SiteModuleTest.php 
b/client/tests/phpunit/includes/Modules/SiteModuleTest.php
index b24b956..2f4a3e1 100644
--- a/client/tests/phpunit/includes/Modules/SiteModuleTest.php
+++ b/client/tests/phpunit/includes/Modules/SiteModuleTest.php
@@ -29,7 +29,7 @@
        public function testGetScript() {
                $module = new SiteModule();
                $script = $module->getScript( $this->getContext() );
-               $this->assertStringStartsWith( 
'mw.config.set({"wbCurrentSite":', $script );
+               $this->assertContains( '.config.set({"wbCurrentSite":', $script 
);
                $this->assertStringEndsWith( '});', $script );
        }
 
diff --git a/lib/tests/phpunit/Modules/RepoAccessModuleTest.php 
b/lib/tests/phpunit/Modules/RepoAccessModuleTest.php
index 1fb31f9..98c2033 100644
--- a/lib/tests/phpunit/Modules/RepoAccessModuleTest.php
+++ b/lib/tests/phpunit/Modules/RepoAccessModuleTest.php
@@ -28,7 +28,7 @@
        public function testGetScript() {
                $module = new RepoAccessModule();
                $script = $module->getScript( $this->getContext() );
-               $this->assertStringStartsWith( 'mw.config.set({"wbRepo":', 
$script );
+               $this->assertContains( '.config.set({"wbRepo":', $script );
                $this->assertStringEndsWith( '});', $script );
        }
 
diff --git a/lib/tests/phpunit/Modules/SitesModuleTest.php 
b/lib/tests/phpunit/Modules/SitesModuleTest.php
index c222570..6117562 100644
--- a/lib/tests/phpunit/Modules/SitesModuleTest.php
+++ b/lib/tests/phpunit/Modules/SitesModuleTest.php
@@ -37,7 +37,7 @@
        public function testGetScript() {
                $module = new SitesModule();
                $script = $module->getScript( $this->getContext() );
-               $this->assertStringStartsWith( 
'mw.config.set({"wbSiteDetails":', $script );
+               $this->assertContains( '.config.set({"wbSiteDetails":', $script 
);
                $this->assertStringEndsWith( '});', $script );
        }
 
diff --git a/lib/tests/phpunit/Modules/SitesModuleWorkerTest.php 
b/lib/tests/phpunit/Modules/SitesModuleWorkerTest.php
index 18e4694..1aaef2d 100644
--- a/lib/tests/phpunit/Modules/SitesModuleWorkerTest.php
+++ b/lib/tests/phpunit/Modules/SitesModuleWorkerTest.php
@@ -67,7 +67,7 @@
 
                $result = $worker->getScript( $languageCode );
 
-               $this->assertEquals( 'mw.config.set({"wbSiteDetails":' . 
$expected . '});', $result );
+               $this->assertContains( '.config.set({"wbSiteDetails":' . 
$expected . '});', $result );
        }
 
        public function getScriptProvider() {
diff --git a/repo/tests/phpunit/includes/Modules/MediaWikiConfigModuleTest.php 
b/repo/tests/phpunit/includes/Modules/MediaWikiConfigModuleTest.php
index 7f98725..b3d5916 100644
--- a/repo/tests/phpunit/includes/Modules/MediaWikiConfigModuleTest.php
+++ b/repo/tests/phpunit/includes/Modules/MediaWikiConfigModuleTest.php
@@ -31,7 +31,7 @@
                        ->method( $this->anything() );
 
                $script = $this->newInstance()->getScript( $context );
-               $this->assertStringStartsWith( 'mw.config.set({', $script );
+               $this->assertContains( '.config.set({', $script );
                $this->assertContains( 'dummyKey', $script );
                $this->assertContains( 'dummyValue', $script );
        }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2699223e45c2065638fdaf8d87ca470a8fd92d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Fomafix <foma...@googlemail.com>

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