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 "Drop zh-tw message "saveprefs""
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
parser
/
TidyTest.php
diff --git
a/tests/phpunit/includes/parser/TidyTest.php
b/tests/phpunit/includes/parser/TidyTest.php
index
c869258
..
5db2908
100644
(file)
--- a/
tests/phpunit/includes/parser/TidyTest.php
+++ b/
tests/phpunit/includes/parser/TidyTest.php
@@
-7,8
+7,7
@@
class TidyTest extends MediaWikiTestCase {
protected function setUp() {
parent::setUp();
protected function setUp() {
parent::setUp();
- $check = MWTidy::tidy( '' );
- if ( strpos( $check, '<!--' ) !== false ) {
+ if ( !MWTidy::isEnabled() ) {
$this->markTestSkipped( 'Tidy not found' );
}
}
$this->markTestSkipped( 'Tidy not found' );
}
}
@@
-25,7
+24,7
@@
class TidyTest extends MediaWikiTestCase {
$this->assertEquals( $expected, $text, $msg );
}
$this->assertEquals( $expected, $text, $msg );
}
- public function provideTestWrapping() {
+ public
static
function provideTestWrapping() {
$testMathML = <<<'MathML'
<math xmlns="http://www.w3.org/1998/Math/MathML">
<mrow>
$testMathML = <<<'MathML'
<math xmlns="http://www.w3.org/1998/Math/MathML">
<mrow>