Merge pull request #8142 from nextcloud/13-update-server
[stable13] Use correct update server
This commit is contained in:
commit
b2e3e29266
|
@ -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 = [
|
||||
|
|
|
@ -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',
|
||||
];
|
||||
|
||||
|
|
Loading…
Reference in New Issue