MediaWiki r100592 - Code Review

Repository:	MediaWiki
Revision:	< r100591‎ \| r100592 (on ViewVC)‎ \| r100593 >
Date:	09:32, 24 October 2011
Author:	hashar
Status:	ok (Comments)
Tags:
Comment:	test {{SERVERNAME}} with relative URLS bug 31176 mentionned an issue with {{SERVERNAME}} returning the full URL instead of servername when using relative URLs (//localhost). The fix was made by r98193. This patch test three different URL protocols (http, https & relative) and check we return the expected 'localhost'.
Modified paths:	/trunk/phase3/tests/phpunit/includes/parser/MagicVariableTest.php (modified) (history) (diff)

Diff [purge]

Index: trunk/phase3/tests/phpunit/includes/parser/MagicVariableTest.php
—	—	@@ -117,6 +117,24 @@
118	118	$this->assertUnPadded( 'revisionmonth1', $month );
119	119	}
120	120
	121	+ /**
	122	+ * Rough tests for {{SERVERNAME}} magic word
	123	+ * Bug 31176
	124	+ */
	125	+ function testServernameFromDifferentProtocols() {
	126	+ global $wgServer;
	127	+ $saved_wgServer= $wgServer;
	128	+
	129	+ $wgServer = 'http://localhost/';
	130	+ $this->assertMagic( 'localhost', 'servername' );
	131	+ $wgServer = 'https://localhost/';
	132	+ $this->assertMagic( 'localhost', 'servername' );
	133	+ $wgServer = '//localhost/'; # bug 31176
	134	+ $this->assertMagic( 'localhost', 'servername' );
	135	+
	136	+ $wgServer = $saved_wgServer;
	137	+ }
	138	+
121	139	############### HELPERS ############################################
122	140
123	141	/** assertion helper expecting a magic output which is zero padded */

Rev.	Commit summary	Author	Date
r100750	REL1_18 MFT r98997, r99118, r99370, r99700, r100239, r100242, r100347, r10051...	reedy	21:51, 25 October 2011

Rev.	Commit summary	Author	Date
r98193	(bug 31176) {{SERVERNAME}} doesn't play nice with protocol-relative URLs	catrope	23:14, 26 September 2011

#Comment by Hashar (talk | contribs) 09:33, 24 October 2011

tagging 1.18 to get it in Jenkins for REL1_18

21:51, 25 October 2011 Reedy (talk | contribs) changed the tags for r100592 [removed: 1.18]
11:48, 25 October 2011 Catrope (talk | contribs) changed the status of r100592 [removed: new added: ok]
09:33, 24 October 2011 Hashar (talk | contribs) changed the tags for r100592 [added: 1.18]