jenkins-bot has submitted this change and it was merged. Change subject: JavaScriptContentTest: $wgScript != $wgScriptPath ......................................................................
JavaScriptContentTest: $wgScript != $wgScriptPath Set $wgScript, $wgScriptPath and $wgResourceBasePath to avoid failures when running on a wiki with a non-standard $wgScriptPath. Reported-on: https://lists.wikimedia.org/pipermail/wikitech-l/2015-October/083675.html Change-Id: I8acbcca5449060ff5604bf275f690b53343e706e --- M tests/phpunit/includes/content/JavaScriptContentTest.php 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/phpunit/includes/content/JavaScriptContentTest.php b/tests/phpunit/includes/content/JavaScriptContentTest.php index b97842c..a636e56 100644 --- a/tests/phpunit/includes/content/JavaScriptContentTest.php +++ b/tests/phpunit/includes/content/JavaScriptContentTest.php @@ -258,7 +258,9 @@ public function testUpdateRedirect( $oldText, $expectedText ) { $this->setMwGlobals( array( 'wgServer' => '//example.org', - 'wgScriptPath' => '/w/index.php', + 'wgScriptPath' => '/w', + 'wgScript' => '/w/index.php', + 'wgResourceBasePath' => '/w', ) ); $target = Title::newFromText( "testUpdateRedirect_target" ); @@ -317,7 +319,9 @@ public function testGetRedirectTarget( $title, $text ) { $this->setMwGlobals( array( 'wgServer' => '//example.org', - 'wgScriptPath' => '/w/index.php', + 'wgScriptPath' => '/w', + 'wgScript' => '/w/index.php', + 'wgResourceBasePath' => '/w', ) ); $content = new JavaScriptContent( $text ); $target = $content->getRedirectTarget(); -- To view, visit https://gerrit.wikimedia.org/r/249004 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8acbcca5449060ff5604bf275f690b53343e706e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: saper <[email protected]> Gerrit-Reviewer: Amire80 <[email protected]> Gerrit-Reviewer: Anomie <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: Reedy <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
