jenkins-bot has submitted this change and it was merged.
Change subject: Get tokens for testing API modules from User obj
......................................................................
Get tokens for testing API modules from User obj
We used to make an extra API call to get the token.
Change-Id: I2382917e66a996cdd50132c2371826ed99ab6055
---
M repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
Hoo man: Looks good to me, approved
WikidataJenkins: Verified
jenkins-bot: Verified
diff --git a/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
b/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
index 326b139..de74ae8 100644
--- a/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
+++ b/repo/tests/phpunit/includes/api/WikibaseApiTestCase.php
@@ -74,7 +74,14 @@
* Appends an edit token to a request
*/
protected function doApiRequestWithToken( array $params, array $session
= null, User $user = null ) {
- $params['token'] = $this->getToken();
+ if ( !$user ) {
+ $user = $GLOBALS['wgUser'];
+ }
+
+ if ( !array_key_exists( 'token', $params ) ) {
+ $params['token'] = $user->getEditToken();
+ }
+
return $this->doApiRequest( $params, $session, false, $user );
}
--
To view, visit https://gerrit.wikimedia.org/r/150802
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2382917e66a996cdd50132c2371826ed99ab6055
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: WikidataJenkins <wikidata-servi...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
