upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 23:03:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 78

fix(updatenotification): Adjust tests for changed IAppConfig

Browse source 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
Ferdinand Thiessen 2024-03-08 01:35:04 +01:00
parent 27b09ce00a
commit 2c87fbf207
No known key found for this signature in database
GPG key ID: 45FAE7268762B400
4 changed files with 35 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/updatenotification/lib/BackgroundJob/UpdateAvailableNotifications.php
View file

@ -218,7 +218,8 @@ class UpdateAvailableNotifications extends TimedJob {
}
}
return array_unique($this->users);
$this->users = array_values(array_unique($this->users));
return $this->users;
}
/**

21
apps/updatenotification/tests/BackgroundJob/ResetTokenTest.php
View file

@ -57,9 +57,9 @@ class ResetTokenTest extends TestCase {
->expects($this->atLeastOnce())
->method('getTime')
->willReturn(123);
$this->config
$this->appConfig
->expects($this->once())
->method('getAppValue')
->method('getValueInt')
->with('core', 'updater.secret.created', 123);
$this->config
->expects($this->once())
@ -75,13 +75,14 @@ class ResetTokenTest extends TestCase {
public function testRunWithExpiredToken() {
$this->timeFactory
->expects($this->exactly(2))
->method('getTime')
->willReturnOnConsecutiveCalls(1455131633, 1455045234);
$this->config
->expects($this->once())
->method('getAppValue')
->with('core', 'updater.secret.created', 1455045234);
->method('getTime')
->willReturn(1455045234);
$this->appConfig
->expects($this->once())
->method('getValueInt')
->with('core', 'updater.secret.created', 1455045234)
->willReturn(2 * 24 * 60 * 60 + 1); // over 2 days
$this->config
->expects($this->once())
->method('deleteSystemValue')
@ -94,9 +95,9 @@ class ResetTokenTest extends TestCase {
$this->timeFactory
->expects($this->never())
->method('getTime');
$this->config
$this->appConfig
->expects($this->never())
->method('getAppValue');
->method('getValueInt');
$this->config
->expects($this->once())
->method('getSystemValueBool')

40
apps/updatenotification/tests/BackgroundJob/UpdateAvailableNotificationsTest.php
View file

@ -211,19 +211,19 @@ class UpdateAvailableNotificationsTest extends TestCase {
$job->expects($this->never())
->method('clearErrorNotifications');
$this->config->expects($this->once())
->method('getAppValue')
->willReturn($errorDays);
$this->config->expects($this->once())
->method('setAppValue')
->with('updatenotification', 'update_check_errors', $errorDays + 1);
$this->appConfig->expects($this->once())
->method('getAppValueInt')
->willReturn($errorDays ?? 0);
$this->appConfig->expects($this->once())
->method('setAppValueInt')
->with('update_check_errors', $errorDays + 1);
$job->expects($errorDays !== null ? $this->once() : $this->never())
->method('sendErrorNotifications')
->with($errorDays + 1);
} else {
$this->config->expects($this->once())
->method('setAppValue')
->with('updatenotification', 'update_check_errors', 0);
$this->appConfig->expects($this->once())
->method('setAppValueInt')
->with('update_check_errors', 0);
$job->expects($this->once())
->method('clearErrorNotifications');
$job->expects($this->once())
@ -302,15 +302,15 @@ class UpdateAvailableNotificationsTest extends TestCase {
'getUsersToNotify',
]);
$this->config->expects($this->once())
->method('getAppValue')
->with('updatenotification', $app, false)
->willReturn($lastNotification);
$this->appConfig->expects($this->once())
->method('getAppValueString')
->with($app, '')
->willReturn($lastNotification ? $lastNotification : '');
if ($lastNotification !== $version) {
$this->config->expects($this->once())
->method('setAppValue')
->with('updatenotification', $app, $version);
$this->appConfig->expects($this->once())
->method('setAppValueString')
->with($app, $version);
}
if ($callDelete === false) {
@ -386,10 +386,10 @@ class UpdateAvailableNotificationsTest extends TestCase {
public function testGetUsersToNotify(array $groups, array $groupUsers, array $expected) {
$job = $this->getJob();
$this->config->expects($this->once())
->method('getAppValue')
->with('updatenotification', 'notify_groups', '["admin"]')
->willReturn(json_encode($groups));
$this->appConfig->expects($this->once())
->method('getAppValueArray')
->with('notify_groups', ['admin'])
->willReturn($groups);
$groupMap = [];
foreach ($groupUsers as $gid => $uids) {

4
apps/updatenotification/tests/Controller/AdminControllerTest.php
View file

@ -92,9 +92,9 @@ class AdminControllerTest extends TestCase {
->expects($this->once())
->method('getTime')
->willReturn(12345);
$this->config
$this->appConfig
->expects($this->once())
->method('setAppValue')
->method('setValueInt')
->with('core', 'updater.secret.created', 12345);
$expected = new DataResponse('MyGeneratedToken');