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 "Accessibility: Make the collapsible sidebar screen reader friendly"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
RevisionStorageTest_ContentHandlerUseDB.php
diff --git
a/tests/phpunit/includes/RevisionStorageTest_ContentHandlerUseDB.php
b/tests/phpunit/includes/RevisionStorageTest_ContentHandlerUseDB.php
index
3948e34
..
4e83e35
100644
(file)
--- a/
tests/phpunit/includes/RevisionStorageTest_ContentHandlerUseDB.php
+++ b/
tests/phpunit/includes/RevisionStorageTest_ContentHandlerUseDB.php
@@
-6,14
+6,9
@@
* ^--- important, causes temporary tables to be used instead of the real database
*/
class RevisionTest_ContentHandlerUseDB extends RevisionStorageTest {
* ^--- important, causes temporary tables to be used instead of the real database
*/
class RevisionTest_ContentHandlerUseDB extends RevisionStorageTest {
- var $saveContentHandlerNoDB = null;
- function setUp() {
- global $wgContentHandlerUseDB;
-
- $this->saveContentHandlerNoDB = $wgContentHandlerUseDB;
-
- $wgContentHandlerUseDB = false;
+ protected function setUp() {
+ $this->setMwGlobals( 'wgContentHandlerUseDB', false );
$dbw = wfGetDB( DB_MASTER );
$dbw = wfGetDB( DB_MASTER );
@@
-32,14
+27,6
@@
class RevisionTest_ContentHandlerUseDB extends RevisionStorageTest {
parent::setUp();
}
parent::setUp();
}
- function tearDown() {
- global $wgContentHandlerUseDB;
-
- parent::tearDown();
-
- $wgContentHandlerUseDB = $this->saveContentHandlerNoDB;
- }
-
/**
* @covers Revision::selectFields
*/
/**
* @covers Revision::selectFields
*/
@@
-76,7
+63,7
@@
class RevisionTest_ContentHandlerUseDB extends RevisionStorageTest {
*/
public function testGetContentFormat() {
try {
*/
public function testGetContentFormat() {
try {
- //
@todo:
change this to test failure on using a non-standard (but supported) format
+ //
@todo
change this to test failure on using a non-standard (but supported) format
// for a content model supported in the given location. As of 1.21, there are
// no alternative formats for any of the standard content models that could be
// used for this though.
// for a content model supported in the given location. As of 1.21, there are
// no alternative formats for any of the standard content models that could be
// used for this though.
@@
-91,5
+78,4
@@
class RevisionTest_ContentHandlerUseDB extends RevisionStorageTest {
$this->assertTrue( true ); // ok
}
}
$this->assertTrue( true ); // ok
}
}
-
}
}