| Index: trunk/phase3/tests/phpunit/includes/api/ApiWatchTest.php |
| — | — | @@ -15,8 +15,8 @@ |
| 16 | 16 | function testLogin() { |
| 17 | 17 | $data = $this->doApiRequest( array( |
| 18 | 18 | 'action' => 'login', |
| 19 | | - 'lgname' => self::$sysopUser->userName, |
| 20 | | - 'lgpassword' => self::$sysopUser->password ) ); |
| | 19 | + 'lgname' => $this->sysopUser->userName, |
| | 20 | + 'lgpassword' => $this->sysopUser->password ) ); |
| 21 | 21 | |
| 22 | 22 | $this->assertArrayHasKey( "login", $data[0] ); |
| 23 | 23 | $this->assertArrayHasKey( "result", $data[0]['login'] ); |
| — | — | @@ -26,8 +26,8 @@ |
| 27 | 27 | $data = $this->doApiRequest( array( |
| 28 | 28 | 'action' => 'login', |
| 29 | 29 | "lgtoken" => $token, |
| 30 | | - "lgname" => self::$sysopUser->userName, |
| 31 | | - "lgpassword" => self::$sysopUser->password ), $data ); |
| | 30 | + "lgname" => $this->sysopUser->userName, |
| | 31 | + "lgpassword" => $this->sysopUser->password ), $data ); |
| 32 | 32 | |
| 33 | 33 | $this->assertArrayHasKey( "login", $data[0] ); |
| 34 | 34 | $this->assertArrayHasKey( "result", $data[0]['login'] ); |
| — | — | @@ -38,7 +38,7 @@ |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | function testGettingToken() { |
| 42 | | - foreach ( array( self::$user, self::$sysopUser ) as $user ) { |
| | 42 | + foreach ( array( $this->user, $this->sysopUser ) as $user ) { |
| 43 | 43 | $this->getUserTokens( $user ); |
| 44 | 44 | } |
| 45 | 45 | } |
| — | — | @@ -79,7 +79,7 @@ |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | function testGetToken() { |
| 83 | | - return $this->getUserTokens( self::$sysopUser ); |
| | 83 | + return $this->getUserTokens( $this->sysopUser ); |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | /** |