mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23121 from nextcloud/backport/23112/stable20 

[stable20] Increase the timeout of statuses
This commit is contained in:
Roeland Jago Douma 2020-10-01 15:09:51 +02:00 committed by GitHub
parent 612306d290 d7d805ef79
commit 2433550eff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/user_status/lib/Service/StatusService.php
View File

@ -77,7 +77,7 @@ class StatusService {
]; ];
/** @var int */ /** @var int */
public const INVALIDATE_STATUS_THRESHOLD = 5 /* minutes */ * 60 /* seconds */; public const INVALIDATE_STATUS_THRESHOLD = 15 /* minutes */ * 60 /* seconds */;
/** @var int */ /** @var int */
public const MAXIMUM_MESSAGE_LENGTH = 80; public const MAXIMUM_MESSAGE_LENGTH = 80;

2
apps/user_status/tests/Unit/BackgroundJob/ClearOldStatusesBackgroundJobTest.php
View File

@ -56,7 +56,7 @@ class ClearOldStatusesBackgroundJobTest extends TestCase {
->with(1337); ->with(1337);
$this->mapper->expects($this->once()) $this->mapper->expects($this->once())
->method('clearStatusesOlderThan') ->method('clearStatusesOlderThan')
->with(1037, 1337); ->with(437, 1337);
$this->time->method('getTime') $this->time->method('getTime')
->willReturn(1337); ->willReturn(1337);

4
apps/user_status/tests/Unit/Service/StatusServiceTest.php
View File

@ -152,7 +152,7 @@ class StatusServiceTest extends TestCase {
$status->setIsUserDefined(true); $status->setIsUserDefined(true);
$this->timeFactory->method('getTime') $this->timeFactory->method('getTime')
->willReturn(1400); ->willReturn(2600);
$this->mapper->expects($this->once()) $this->mapper->expects($this->once())
->method('findByUserId') ->method('findByUserId')
->with('john.doe') ->with('john.doe')
@ -160,7 +160,7 @@ class StatusServiceTest extends TestCase {
$this->assertEquals($status, $this->service->findByUserId('john.doe')); $this->assertEquals($status, $this->service->findByUserId('john.doe'));
$this->assertEquals('offline', $status->getStatus()); $this->assertEquals('offline', $status->getStatus());
$this->assertEquals(1400, $status->getStatusTimestamp()); $this->assertEquals(2600, $status->getStatusTimestamp());
$this->assertFalse($status->getIsUserDefined()); $this->assertFalse($status->getIsUserDefined());
} }