Merge "Refactor ApiTestCase to get token from ApiQueryTokens"

diff --cc tests/phpunit/includes/api/ApiTestCase.php
index 7ecb729,8e53b55..d5078bf
--- 1/tests/phpunit/includes/api/ApiTestCase.php
--- 2/tests/phpunit/includes/api/ApiTestCase.php
+++ b/tests/phpunit/includes/api/ApiTestCase.php
@@@ -67,8 -69,9 +69,10 @@@ abstract class ApiTestCase extends Medi
         * @param array|null $session
         * @param bool $appendModule
         * @param User|null $user
+        * @param string|null $tokenType Set to a string like 'csrf' to send an
+        *   appropriate token
         *
 +       * @throws ApiUsageException
         * @return array
         */
        protected function doApiRequest( array $params, array $session = null,