dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Create Special:NewSection special page"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
WebRequestTest.php
diff --git
a/tests/phpunit/includes/WebRequestTest.php
b/tests/phpunit/includes/WebRequestTest.php
index
cda5660
..
0d5c59b
100644
(file)
--- a/
tests/phpunit/includes/WebRequestTest.php
+++ b/
tests/phpunit/includes/WebRequestTest.php
@@
-391,7
+391,7
@@
class WebRequestTest extends MediaWikiTestCase {
* @dataProvider provideGetIP
* @covers WebRequest::getIP
*/
* @dataProvider provideGetIP
* @covers WebRequest::getIP
*/
- public function testGetIP( $expected, $input, $
squid
, $xffList, $private, $description ) {
+ public function testGetIP( $expected, $input, $
cdn
, $xffList, $private, $description ) {
$this->setServerVars( $input );
$this->setMwGlobals( [
'wgUsePrivateIPs' => $private,
$this->setServerVars( $input );
$this->setMwGlobals( [
'wgUsePrivateIPs' => $private,
@@
-405,7
+405,7
@@
class WebRequestTest extends MediaWikiTestCase {
]
] );
]
] );
- $this->setService( 'ProxyLookup', new ProxyLookup( [], $
squid
) );
+ $this->setService( 'ProxyLookup', new ProxyLookup( [], $
cdn
) );
$request = new WebRequest();
$result = $request->getIP();
$request = new WebRequest();
$result = $request->getIP();
@@
-587,8
+587,8
@@
class WebRequestTest extends MediaWikiTestCase {
public function testGetIpLackOfRemoteAddrThrowAnException() {
// ensure that local install state doesn't interfere with test
$this->setMwGlobals( [
public function testGetIpLackOfRemoteAddrThrowAnException() {
// ensure that local install state doesn't interfere with test
$this->setMwGlobals( [
- 'wg
SquidServersNoPurge
' => [],
- 'wg
SquidServers
' => [],
+ 'wg
CdnServers
' => [],
+ 'wg
CdnServersNoPurge
' => [],
'wgUsePrivateIPs' => false,
'wgHooks' => [],
] );
'wgUsePrivateIPs' => false,
'wgHooks' => [],
] );