jenkins-bot has submitted this change and it was merged.
Change subject: Updating Response API for new schema (adding isLoggedIn)
......................................................................
Updating Response API for new schema (adding isLoggedIn)
Also updating unit test.
Change-Id: Ifedf775b72e5e5f0f6bad6335e633c98f776ad98
---
M includes/api/ApiResponse.php
M tests/phpunit/api/ApiResponseTest.php
2 files changed, 11 insertions(+), 3 deletions(-)
Approvals:
Robmoen: Looks good to me, approved
Bmansurov: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/api/ApiResponse.php b/includes/api/ApiResponse.php
index e57f552..9ec2fff 100644
--- a/includes/api/ApiResponse.php
+++ b/includes/api/ApiResponse.php
@@ -11,7 +11,7 @@
class ApiResponse extends ApiBase {
const SCHEMA = 'MobileWebWikiGrokResponse';
- const SCHEMA_REV_ID = 10278938;
+ const SCHEMA_REV_ID = 10352279;
/**
* Executes the action.
@@ -41,6 +41,7 @@
'subject' => $params['subject'],
'mobileMode' => $params['mobile_mode'],
'testing' => $params['testing'],
+ 'isLoggedIn' => $user->isLoggedIn(),
);
$eventLogger = $this->getEventLogger();
diff --git a/tests/phpunit/api/ApiResponseTest.php
b/tests/phpunit/api/ApiResponseTest.php
index d209d50..4d95c2b 100644
--- a/tests/phpunit/api/ApiResponseTest.php
+++ b/tests/phpunit/api/ApiResponseTest.php
@@ -41,12 +41,17 @@
}
class StubUser extends User {
- public function __construct( $editCount ) {
+ public function __construct( $editCount, $isLoggedIn ) {
$this->editCount = $editCount;
+ $this->isLoggedIn = $isLoggedIn;
}
public function getEditCount() {
return $this->editCount;
+ }
+
+ public function isLoggedIn() {
+ return $this->isLoggedIn;
}
}
@@ -64,7 +69,7 @@
);
$this->eventLogger = $this->getMock( 'WikiGrok\EventLogger' );
- $this->user = new StubUser( 1234 );
+ $this->user = new StubUser( 1234, true );
$this->context = new RequestContext();
$this->api = new StubApiResponse(
$this->eventLogger,
@@ -244,6 +249,7 @@
'value' => 'insurance broker',
'response' => true,
'testing' => true,
+ 'isLoggedIn' => true,
),
array(
'pageId' => 1,
@@ -260,6 +266,7 @@
'value' => 'engineer',
'response' => false,
'testing' => true,
+ 'isLoggedIn' => true,
),
),
),
--
To view, visit https://gerrit.wikimedia.org/r/173333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifedf775b72e5e5f0f6bad6335e633c98f776ad98
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikiGrok
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jhernandez <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Phuedx <[email protected]>
Gerrit-Reviewer: Robmoen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
