Merge "Don't check namespace in SpecialWantedtemplates"

[lhc/web/wiklou.git] / tests / phpunit / includes / api / ApiUploadTest.php

diff --git a/tests/phpunit/includes/api/ApiUploadTest.php b/tests/phpunit/includes/api/ApiUploadTest.php
index b7f7d10..c852d72 100644 (file)
--- a/tests/phpunit/includes/api/ApiUploadTest.php
+++ b/tests/phpunit/includes/api/ApiUploadTest.php
@@ -80,7 +80,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
                try {
                        $this->doApiRequestWithToken( array(
                                'action' => 'upload',
-                       ), $session, self::$users['uploader']->user );
+                       ), $session, self::$users['uploader']->getUser() );
                } catch ( UsageException $e ) {
                        $exception = true;
                        $this->assertEquals( "One of the parameters filekey, file, url, statuskey is required",
@@ -126,7 +126,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
                $exception = false;
                try {
                        list( $result, , ) = $this->doApiRequestWithToken( $params, $session,
-                               self::$users['uploader']->user );
+                               self::$users['uploader']->getUser() );
                } catch ( UsageException $e ) {
                        $exception = true;
                }
@@ -165,7 +165,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
 
                $exception = false;
                try {
-                       $this->doApiRequestWithToken( $params, $session, self::$users['uploader']->user );
+                       $this->doApiRequestWithToken( $params, $session, self::$users['uploader']->getUser() );
                } catch ( UsageException $e ) {
                        $this->assertContains( 'The file you submitted was empty', $e->getMessage() );
                        $exception = true;
@@ -215,7 +215,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
                $exception = false;
                try {
                        list( $result, , $session ) = $this->doApiRequestWithToken( $params, $session,
-                               self::$users['uploader']->user );
+                               self::$users['uploader']->getUser() );
                } catch ( UsageException $e ) {
                        $exception = true;
                }
@@ -232,7 +232,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
                $exception = false;
                try {
                        list( $result, , ) = $this->doApiRequestWithToken( $params, $session,
-                               self::$users['uploader']->user ); // FIXME: leaks a temporary file
+                               self::$users['uploader']->getUser() ); // FIXME: leaks a temporary file
                } catch ( UsageException $e ) {
                        $exception = true;
                }
@@ -286,7 +286,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
                $exception = false;
                try {
                        list( $result, , $session ) = $this->doApiRequestWithToken( $params, $session,
-                               self::$users['uploader']->user );
+                               self::$users['uploader']->getUser() );
                } catch ( UsageException $e ) {
                        $exception = true;
                }
@@ -311,7 +311,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
                $exception = false;
                try {
                        list( $result ) = $this->doApiRequestWithToken( $params, $session,
-                               self::$users['uploader']->user ); // FIXME: leaks a temporary file
+                               self::$users['uploader']->getUser() ); // FIXME: leaks a temporary file
                } catch ( UsageException $e ) {
                        $exception = true;
                }
@@ -331,7 +331,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
         */
        public function testUploadStash( $session ) {
                $this->setMwGlobals( array(
-                       'wgUser' => self::$users['uploader']->user, // @todo FIXME: still used somewhere
+                       'wgUser' => self::$users['uploader']->getUser(), // @todo FIXME: still used somewhere
                ) );
 
                $extension = 'png';
@@ -368,7 +368,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
                $exception = false;
                try {
                        list( $result, , $session ) = $this->doApiRequestWithToken( $params, $session,
-                               self::$users['uploader']->user ); // FIXME: leaks a temporary file
+                               self::$users['uploader']->getUser() ); // FIXME: leaks a temporary file
                } catch ( UsageException $e ) {
                        $exception = true;
                }
@@ -397,7 +397,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
                $exception = false;
                try {
                        list( $result ) = $this->doApiRequestWithToken( $params, $session,
-                               self::$users['uploader']->user );
+                               self::$users['uploader']->getUser() );
                } catch ( UsageException $e ) {
                        $exception = true;
                }
@@ -415,7 +415,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
        public function testUploadChunks( $session ) {
                $this->setMwGlobals( array(
                        // @todo FIXME: still used somewhere
-                       'wgUser' => self::$users['uploader']->user,
+                       'wgUser' => self::$users['uploader']->getUser(),
                ) );
 
                $chunkSize = 1048576;
@@ -473,7 +473,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
                                // Upload fist chunk ( and get the session key )
                                try {
                                        list( $result, , $session ) = $this->doApiRequestWithToken( $params, $session,
-                                               self::$users['uploader']->user );
+                                               self::$users['uploader']->getUser() );
                                } catch ( UsageException $e ) {
                                        $this->markTestIncomplete( $e->getMessage() );
                                }
@@ -501,7 +501,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
                        // Upload current chunk
                        try {
                                list( $result, , $session ) = $this->doApiRequestWithToken( $params, $session,
-                                       self::$users['uploader']->user );
+                                       self::$users['uploader']->getUser() );
                        } catch ( UsageException $e ) {
                                $this->markTestIncomplete( $e->getMessage() );
                        }
@@ -541,7 +541,7 @@ class ApiUploadTest extends ApiTestCaseUpload {
                $exception = false;
                try {
                        list( $result ) = $this->doApiRequestWithToken( $params, $session,
-                               self::$users['uploader']->user );
+                               self::$users['uploader']->getUser() );
                } catch ( UsageException $e ) {
                        $exception = true;
                }