summaryrefslogtreecommitdiff
path: root/tests/phpunit
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2012-04-26 18:23:31 +0200
committerPierre Schmitz <pierre@archlinux.de>2012-04-26 18:23:31 +0200
commitc4372dd38a4d109b4f3881ea63b667e33adbe503 (patch)
treee8e6dae1229a68c26b7a348c73dc0c8c77da97e5 /tests/phpunit
parentcf566324cfb218f0c7323d97d2a103bbb8d60ba4 (diff)
Update to MediaWiki 1.18.3
Diffstat (limited to 'tests/phpunit')
-rw-r--r--tests/phpunit/includes/TitleTest.php1
-rw-r--r--tests/phpunit/includes/upload/UploadStashTest.php5
-rw-r--r--tests/phpunit/skins/SideBarTest.php5
3 files changed, 9 insertions, 2 deletions
diff --git a/tests/phpunit/includes/TitleTest.php b/tests/phpunit/includes/TitleTest.php
index 51b36160..e7bb98ac 100644
--- a/tests/phpunit/includes/TitleTest.php
+++ b/tests/phpunit/includes/TitleTest.php
@@ -44,6 +44,7 @@ class TitleTest extends MediaWikiTestCase {
* @param string $source
* @param string $target
* @param array|string|true $requiredErrors
+ * @group Database
* @dataProvider dataTestIsValidMoveOperation
*/
function testIsValidMoveOperation( $source, $target, $expected ) {
diff --git a/tests/phpunit/includes/upload/UploadStashTest.php b/tests/phpunit/includes/upload/UploadStashTest.php
index 9c39bc61..e644a259 100644
--- a/tests/phpunit/includes/upload/UploadStashTest.php
+++ b/tests/phpunit/includes/upload/UploadStashTest.php
@@ -28,7 +28,10 @@ class UploadStashTest extends MediaWikiTestCase {
)
);
}
-
+
+ /**
+ * @group Database
+ */
public function testBug29408() {
global $wgUser;
$wgUser = self::$users['uploader']->user;
diff --git a/tests/phpunit/skins/SideBarTest.php b/tests/phpunit/skins/SideBarTest.php
index a9f56900..bf79e760 100644
--- a/tests/phpunit/skins/SideBarTest.php
+++ b/tests/phpunit/skins/SideBarTest.php
@@ -105,7 +105,10 @@ class SideBarTest extends MediaWikiLangTestCase {
);
}
- /** bug 33321 */
+ /**
+ * bug 33321
+ * @group Database
+ */
function testTrickyPipe() {
$this->assertSidebar(
array( 'Title' => array(