| Index: trunk/phase3/tests/phpunit/includes/ExtraParserTest.php |
| — | — | @@ -10,11 +10,13 @@ |
| 11 | 11 | global $wgContLang; |
| 12 | 12 | global $wgShowDBErrorBacktrace; |
| 13 | 13 | global $wgLanguageCode; |
| | 14 | + global $wgAlwaysUseTidy; |
| 14 | 15 | |
| 15 | 16 | $wgShowDBErrorBacktrace = true; |
| 16 | 17 | $wgLanguageCode = 'en'; |
| 17 | 18 | $wgContLang = new Language( 'en' ); |
| 18 | 19 | $wgMemc = new EmptyBagOStuff; |
| | 20 | + $wgAlwaysUseTidy = false; |
| 19 | 21 | |
| 20 | 22 | $this->options = new ParserOptions; |
| 21 | 23 | $this->options->setTemplateCallback( array( __CLASS__, 'statelessFetchTemplate' ) ); |
| Index: trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php |
| — | — | @@ -82,7 +82,7 @@ |
| 83 | 83 | $tmpGlobals['wgLang'] = $context->getLang(); |
| 84 | 84 | $tmpGlobals['wgOut'] = $context->getOutput(); |
| 85 | 85 | $tmpGlobals['wgParser'] = new StubObject( 'wgParser', $GLOBALS['wgParserConf']['class'], array( $GLOBALS['wgParserConf'] ) ); |
| 86 | | - $tmpGlobals['wgRequest'] = new WebRequest; |
| | 86 | + $tmpGlobals['wgRequest'] = $context->getRequest(); |
| 87 | 87 | |
| 88 | 88 | if ( $GLOBALS['wgStyleDirectory'] === false ) { |
| 89 | 89 | $tmpGlobals['wgStyleDirectory'] = "$IP/skins"; |
| Index: trunk/phase3/tests/phpunit/suites/UploadFromUrlTestSuite.php |
| — | — | @@ -52,7 +52,7 @@ |
| 53 | 53 | $wgLang = $context->getLang(); |
| 54 | 54 | $wgOut = $context->getOutput(); |
| 55 | 55 | $wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParserConf ) ); |
| 56 | | - $wgRequest = new WebRequest; |
| | 56 | + $wgRequest = $context->getRequest(); |
| 57 | 57 | |
| 58 | 58 | if ( $wgStyleDirectory === false ) { |
| 59 | 59 | $wgStyleDirectory = "$IP/skins"; |
| Index: trunk/phase3/tests/parser/parserTest.inc |
| — | — | @@ -170,7 +170,7 @@ |
| 171 | 171 | $wgLang = $context->getLang(); |
| 172 | 172 | $wgOut = $context->getOutput(); |
| 173 | 173 | $wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParserConf ) ); |
| 174 | | - $wgRequest = new WebRequest; |
| | 174 | + $wgRequest = $context->getRequest(); |
| 175 | 175 | |
| 176 | 176 | if ( $wgStyleDirectory === false ) { |
| 177 | 177 | $wgStyleDirectory = "$IP/skins"; |