jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365689 )
Change subject: SkinMinerva testGetContextSpecificModule test might use
undefined title
......................................................................
SkinMinerva testGetContextSpecificModule test might use undefined title
Test scenario for getContextSpecificModules() mocks only Skin->getTitle()
behavior, but while executing isAllowedPageAction() Skin will create a
UserPageHelper with default RequestContext. As RequestContext is not mocked,
$context->getTitle() will return undefined what could lead to tests crash
Changes:
- instead of mocking SkinMinerva::getTitle() pass test context with injected
title. Other tests will work properly as MediaWikiTestCase::tearDown() always
restes RequestContext to default
Bug: T170624
Change-Id: I872fddf8d9c52a6875bb6c69a12407a8125fba4c
---
M tests/phpunit/skins/SkinMinervaTest.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/tests/phpunit/skins/SkinMinervaTest.php
b/tests/phpunit/skins/SkinMinervaTest.php
index 7970ed6..9c47447 100644
--- a/tests/phpunit/skins/SkinMinervaTest.php
+++ b/tests/phpunit/skins/SkinMinervaTest.php
@@ -177,10 +177,10 @@
->getMock()
);
$title = Title::newFromText( 'Test' );
- $skin->expects( $this->any() )
- ->method( 'getTitle' )
- ->will( $this->returnValue( $title ) );
+ $testContext = RequestContext::getMain();
+ $testContext->setTitle( $title );
+ $skin->setContext ( $testContext );
$skin->setSkinOptions( [
'fontChanger' => $fontchangerValue,
'backToTop' => $backToTopValue,
--
To view, visit https://gerrit.wikimedia.org/r/365689
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I872fddf8d9c52a6875bb6c69a12407a8125fba4c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Pmiazga <pmia...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
