From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 3 Oct 2010 23:59:42 +0000 (+0000)
Subject: Revert r74240, the depends seem to do some weird dependancy parameter passing or... 
X-Git-Tag: 1.31.0-rc.0~34629
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=9ded60fe21a934dc7defa5ba17da34e3708ecfd2;p=lhc%2Fweb%2Fwiklou.git

Revert r74240, the depends seem to do some weird dependancy parameter passing or something...
---

diff --git a/maintenance/tests/phpunit/includes/api/ApiWatchTest.php b/maintenance/tests/phpunit/includes/api/ApiWatchTest.php
index 689b7050e3..7fa8242d2b 100644
--- a/maintenance/tests/phpunit/includes/api/ApiWatchTest.php
+++ b/maintenance/tests/phpunit/includes/api/ApiWatchTest.php
@@ -29,6 +29,8 @@ class ApiWatchTest extends ApiTestSetup {
 		$this->assertArrayHasKey( "result", $data[0]['login'] );
 		$this->assertEquals( "Success", $data[0]['login']['result'] );
 		$this->assertArrayHasKey( 'lgtoken', $data[0]['login'] );
+
+		return $data;
 	}
 
 	function testGetToken() {
@@ -67,6 +69,8 @@ class ApiWatchTest extends ApiTestSetup {
 		}
 
 	    $GLOBALS['wgUser'] = self::$user->user;
+
+		return $data;
 	}
 
 	/**
@@ -86,8 +90,11 @@ class ApiWatchTest extends ApiTestSetup {
 		$this->assertArrayHasKey( 'edit', $data[0] );
 		$this->assertArrayHasKey( 'result', $data[0]['edit'] );
 		$this->assertEquals( 'Success', $data[0]['edit']['result'] );
+
+		return $data;
 	}
 
+
 	/**
 	 * @depends testWatchEdit
 	 */
@@ -112,6 +119,8 @@ class ApiWatchTest extends ApiTestSetup {
 		$this->assertArrayHasKey( 'query', $data[0] );
 		$this->assertArrayHasKey( 'watchlist', $data[0]['query'] );
 		$this->assertEquals( 0, count( $data[0]['query']['watchlist'] ) );
+
+		return $data;
 	}
 
 	/**
@@ -154,6 +163,8 @@ class ApiWatchTest extends ApiTestSetup {
 		$this->assertArrayHasKey( 'revisions', $data[0]['query']['pages'][$key] );
 		$this->assertArrayHasKey( 0, $data[0]['query']['pages'][$key]['revisions'] );
 		$this->assertArrayHasKey( 'rollbacktoken', $data[0]['query']['pages'][$key]['revisions'][0] );
+
+		return $data;
 	}
 
 	/**