https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112209

Revision: 112209
Author:   preilly
Date:     2012-02-23 15:35:26 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
fix broken test

Modified Paths:
--------------
    trunk/extensions/MobileFrontend/tests/MobileFrontendTest.php

Modified: trunk/extensions/MobileFrontend/tests/MobileFrontendTest.php
===================================================================
--- trunk/extensions/MobileFrontend/tests/MobileFrontendTest.php        
2012-02-23 15:26:07 UTC (rev 112208)
+++ trunk/extensions/MobileFrontend/tests/MobileFrontendTest.php        
2012-02-23 15:35:26 UTC (rev 112209)
@@ -44,10 +44,11 @@
        }
 
        public function testDisableCaching() {
-               global $wgRequest, $wgExtMobileFrontend;
+               global $wgRequest, $wgExtMobileFrontend, $wgSquidServers;
                $disableCaching = self::getMethod( 'disableCaching' );
-
-               $_SERVER['HTTP_VIA'] = '.wikimedia.org:3128';
+               
+               $wgSquidServers = array( '10.64.0.131' );
+               $_SERVER['REMOTE_ADDR'] = '10.64.0.131';
                $disableCaching->invokeArgs( $wgExtMobileFrontend, array() );
                $this->assertEquals( 'no-cache, must-revalidate', 
$wgRequest->response()->getheader( 'Cache-Control' ) );
                $this->assertEquals( 'Sat, 26 Jul 1997 05:00:00 GMT', 
$wgRequest->response()->getheader( 'Expires' ) );
@@ -75,4 +76,4 @@
                $this->assertEquals( '/path/morepath', 
$wgExtMobileFrontend->parseMobileUrlTemplate( 'path' ) );
                $this->assertEquals( array( 'host' => '%h0.m.%h1.%h2', 'path' 
=> '/path/morepath' ), $wgExtMobileFrontend->parseMobileUrlTemplate());
        }
-}
\ No newline at end of file
+}


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to