Skip to content

[stable18] Add tests for update notification controller for non-default updater … #20703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Apr 28, 2020
Merged

[stable18] Add tests for update notification controller for non-default updater … #20703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add tests for update notification controller for non-default updater … 
…server URL

Signed-off-by: Morris Jobke <[email protected]>
  • Loading branch information
@MorrisJobke @backportbot
MorrisJobke authored and backportbot[bot] committed Apr 28, 2020
commit bab82ccea198eb8d481e451efaece6b72e4e1573
2 changes: 1 addition & 1 deletion apps/updatenotification/lib/Settings/Admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public function getForm(): TemplateResponse {
$defaultCustomerUpdateServerURLPrefix = 'https://updates.nextcloud.com/customers/';

$isDefaultUpdateServerURL = $updateServerURL === $defaultUpdateServerURL
|| $updateServerURL === substr($updateServerURL, 0, strlen($defaultCustomerUpdateServerURLPrefix));
|| strpos($updateServerURL, $defaultCustomerUpdateServerURLPrefix) === 0;

$hasValidSubscription = $this->subscriptionRegistry->delegateHasValidSubscription();

Expand Down
170 changes: 170 additions & 0 deletions apps/updatenotification/tests/Settings/AdminTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,176 @@ public function testGetFormWithUpdate() {
$this->assertEquals($expected, $this->admin->getForm());
}

public function testGetFormWithUpdateAndChangedUpdateServer() {
$channels = [
'daily',
'beta',
'stable',
'production',
];
$currentChannel = Util::getChannel();
if ($currentChannel === 'git') {
$channels[] = 'git';
}

$this->config
->expects($this->exactly(2))
->method('getAppValue')
->willReturnMap([
['core', 'lastupdatedat', '', '12345'],
['updatenotification', 'notify_groups', '["admin"]', '["admin"]'],
]);
$this->config
->expects($this->once())
->method('getSystemValue')
->with('updater.server.url', 'https://updates.nextcloud.com/updater_server/')
->willReturn('https://updates.nextcloud.com/updater_server_changed/');
$this->dateTimeFormatter
->expects($this->once())
->method('formatDateTime')
->with('12345')
->willReturn('LastCheckedReturnValue');
$this->updateChecker
->expects($this->once())
->method('getUpdateState')
->willReturn([
'updateAvailable' => true,
'updateVersion' => '8.1.2',
'updateVersionString' => 'Nextcloud 8.1.2',
'downloadLink' => 'https://downloads.nextcloud.org/server',
'changes' => [],
'updaterEnabled' => true,
'versionIsEol' => false,
]);

$group = $this->createMock(IGroup::class);
$group->expects($this->any())
->method('getDisplayName')
->willReturn('Administrators');
$group->expects($this->any())
->method('getGID')
->willReturn('admin');
$this->groupManager->expects($this->once())
->method('get')
->with('admin')
->willReturn($group);

$this->subscriptionRegistry
->expects($this->once())
->method('delegateHasValidSubscription')
->willReturn(true);

$params = [
'json' => json_encode([
'isNewVersionAvailable' => true,
'isUpdateChecked' => true,
'lastChecked' => 'LastCheckedReturnValue',
'currentChannel' => Util::getChannel(),
'channels' => $channels,
'newVersion' => '8.1.2',
'newVersionString' => 'Nextcloud 8.1.2',
'downloadLink' => 'https://downloads.nextcloud.org/server',
'changes' => [],
'updaterEnabled' => true,
'versionIsEol' => false,
'isDefaultUpdateServerURL' => false,
'updateServerURL' => 'https://updates.nextcloud.com/updater_server_changed/',
'notifyGroups' => [
['value' => 'admin', 'label' => 'Administrators'],
],
'hasValidSubscription' => true,
]),
];

$expected = new TemplateResponse('updatenotification', 'admin', $params, '');
$this->assertEquals($expected, $this->admin->getForm());
}

public function testGetFormWithUpdateAndCustomersUpdateServer() {
$channels = [
'daily',
'beta',
'stable',
'production',
];
$currentChannel = Util::getChannel();
if ($currentChannel === 'git') {
$channels[] = 'git';
}

$this->config
->expects($this->exactly(2))
->method('getAppValue')
->willReturnMap([
['core', 'lastupdatedat', '', '12345'],
['updatenotification', 'notify_groups', '["admin"]', '["admin"]'],
]);
$this->config
->expects($this->once())
->method('getSystemValue')
->with('updater.server.url', 'https://updates.nextcloud.com/updater_server/')
->willReturn('https://updates.nextcloud.com/customers/ABC-DEF/');
$this->dateTimeFormatter
->expects($this->once())
->method('formatDateTime')
->with('12345')
->willReturn('LastCheckedReturnValue');
$this->updateChecker
->expects($this->once())
->method('getUpdateState')
->willReturn([
'updateAvailable' => true,
'updateVersion' => '8.1.2',
'updateVersionString' => 'Nextcloud 8.1.2',
'downloadLink' => 'https://downloads.nextcloud.org/server',
'changes' => [],
'updaterEnabled' => true,
'versionIsEol' => false,
]);

$group = $this->createMock(IGroup::class);
$group->expects($this->any())
->method('getDisplayName')
->willReturn('Administrators');
$group->expects($this->any())
->method('getGID')
->willReturn('admin');
$this->groupManager->expects($this->once())
->method('get')
->with('admin')
->willReturn($group);

$this->subscriptionRegistry
->expects($this->once())
->method('delegateHasValidSubscription')
->willReturn(true);

$params = [
'json' => json_encode([
'isNewVersionAvailable' => true,
'isUpdateChecked' => true,
'lastChecked' => 'LastCheckedReturnValue',
'currentChannel' => Util::getChannel(),
'channels' => $channels,
'newVersion' => '8.1.2',
'newVersionString' => 'Nextcloud 8.1.2',
'downloadLink' => 'https://downloads.nextcloud.org/server',
'changes' => [],
'updaterEnabled' => true,
'versionIsEol' => false,
'isDefaultUpdateServerURL' => true,
'updateServerURL' => 'https://updates.nextcloud.com/customers/ABC-DEF/',
'notifyGroups' => [
['value' => 'admin', 'label' => 'Administrators'],
],
'hasValidSubscription' => true,
]),
];

$expected = new TemplateResponse('updatenotification', 'admin', $params, '');
$this->assertEquals($expected, $this->admin->getForm());
}


public function testGetSection() {
$this->assertSame('overview', $this->admin->getSection());
Expand Down