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

Merge pull request #8142 from nextcloud/13-update-server 

[stable13] Use correct update server
This commit is contained in:
Morris Jobke 2018-02-02 12:18:29 +01:00 committed by GitHub
parent 6989c65acf d9e229ab70
commit b2e3e29266
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/updatenotification/lib/Controller/AdminController.php
View File

@ -107,7 +107,7 @@ class AdminController extends Controller implements ISettings {
$notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
$defaultUpdateServerURL = 'https://updates.nextcloud.com/server/';
$defaultUpdateServerURL = 'https://updates.nextcloud.com/updater_server/';
$updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL);
$params = [

12
apps/updatenotification/tests/Controller/AdminControllerTest.php
View File

@ -107,8 +107,8 @@ class AdminControllerTest extends TestCase {
$this->config
->expects($this->once())
->method('getSystemValue')
->with('updater.server.url', 'https://updates.nextcloud.com/server/')
->willReturn('https://updates.nextcloud.com/server/');
->with('updater.server.url', 'https://updates.nextcloud.com/updater_server/')
->willReturn('https://updates.nextcloud.com/updater_server/');
$this->dateTimeFormatter
->expects($this->once())
->method('formatDateTime')
@ -134,7 +134,7 @@ class AdminControllerTest extends TestCase {
'downloadLink' => 'https://downloads.nextcloud.org/server',
'updaterEnabled' => true,
'isDefaultUpdateServerURL' => true,
'updateServerURL' => 'https://updates.nextcloud.com/server/',
'updateServerURL' => 'https://updates.nextcloud.com/updater_server/',
'notify_groups' => 'admin',
];
@ -166,8 +166,8 @@ class AdminControllerTest extends TestCase {
$this->config
->expects($this->once())
->method('getSystemValue')
->with('updater.server.url', 'https://updates.nextcloud.com/server/')
->willReturn('https://updates.nextcloud.com/server/');
->with('updater.server.url', 'https://updates.nextcloud.com/updater_server/')
->willReturn('https://updates.nextcloud.com/updater_server/');
$this->dateTimeFormatter
->expects($this->once())
->method('formatDateTime')
@ -188,7 +188,7 @@ class AdminControllerTest extends TestCase {
'downloadLink' => '',
'updaterEnabled' => 0,
'isDefaultUpdateServerURL' => true,
'updateServerURL' => 'https://updates.nextcloud.com/server/',
'updateServerURL' => 'https://updates.nextcloud.com/updater_server/',
'notify_groups' => 'admin',
];