Merge pull request #17217 from owncloud/use-new-updater-url
Use new updater URL + add unit tests
This commit is contained in:
commit
aa595392f6
|
@ -74,7 +74,9 @@ class Updater extends BasicEmitter {
|
||||||
* @param IConfig $config
|
* @param IConfig $config
|
||||||
* @param ILogger $log
|
* @param ILogger $log
|
||||||
*/
|
*/
|
||||||
public function __construct(HTTPHelper $httpHelper, IConfig $config, ILogger $log = null) {
|
public function __construct(HTTPHelper $httpHelper,
|
||||||
|
IConfig $config,
|
||||||
|
ILogger $log = null) {
|
||||||
$this->httpHelper = $httpHelper;
|
$this->httpHelper = $httpHelper;
|
||||||
$this->log = $log;
|
$this->log = $log;
|
||||||
$this->config = $config;
|
$this->config = $config;
|
||||||
|
@ -127,12 +129,12 @@ class Updater extends BasicEmitter {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_null($updaterUrl)) {
|
if (is_null($updaterUrl)) {
|
||||||
$updaterUrl = 'https://apps.owncloud.com/updater.php';
|
$updaterUrl = 'https://updates.owncloud.com/server/';
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->config->setAppValue('core', 'lastupdatedat', time());
|
$this->config->setAppValue('core', 'lastupdatedat', time());
|
||||||
|
|
||||||
if ($this->config->getAppValue('core', 'installedat', '') == '') {
|
if ($this->config->getAppValue('core', 'installedat', '') === '') {
|
||||||
$this->config->setAppValue('core', 'installedat', microtime(true));
|
$this->config->setAppValue('core', 'installedat', microtime(true));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -147,22 +149,20 @@ class Updater extends BasicEmitter {
|
||||||
//fetch xml data from updater
|
//fetch xml data from updater
|
||||||
$url = $updaterUrl . '?version=' . $versionString;
|
$url = $updaterUrl . '?version=' . $versionString;
|
||||||
|
|
||||||
// set a sensible timeout of 10 sec to stay responsive even if the update server is down.
|
$tmp = [];
|
||||||
|
|
||||||
$tmp = array();
|
|
||||||
$xml = $this->httpHelper->getUrlContent($url);
|
$xml = $this->httpHelper->getUrlContent($url);
|
||||||
if ($xml) {
|
if ($xml) {
|
||||||
$loadEntities = libxml_disable_entity_loader(true);
|
$loadEntities = libxml_disable_entity_loader(true);
|
||||||
$data = @simplexml_load_string($xml);
|
$data = @simplexml_load_string($xml);
|
||||||
libxml_disable_entity_loader($loadEntities);
|
libxml_disable_entity_loader($loadEntities);
|
||||||
if ($data !== false) {
|
if ($data !== false) {
|
||||||
$tmp['version'] = $data->version;
|
$tmp['version'] = (string)$data->version;
|
||||||
$tmp['versionstring'] = $data->versionstring;
|
$tmp['versionstring'] = (string)$data->versionstring;
|
||||||
$tmp['url'] = $data->url;
|
$tmp['url'] = (string)$data->url;
|
||||||
$tmp['web'] = $data->web;
|
$tmp['web'] = (string)$data->web;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$data = array();
|
$data = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
// Cache the result
|
// Cache the result
|
||||||
|
@ -360,7 +360,6 @@ class Updater extends BasicEmitter {
|
||||||
include \OC_App::getAppPath($appId) . '/appinfo/preupdate.php';
|
include \OC_App::getAppPath($appId) . '/appinfo/preupdate.php';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* upgrades all apps within a major ownCloud upgrade. Also loads "priority"
|
* upgrades all apps within a major ownCloud upgrade. Also loads "priority"
|
||||||
* (types authentication, filesystem, logging, in that order) afterwards.
|
* (types authentication, filesystem, logging, in that order) afterwards.
|
||||||
|
@ -411,6 +410,9 @@ class Updater extends BasicEmitter {
|
||||||
* ownCloud version. disable them if not.
|
* ownCloud version. disable them if not.
|
||||||
* This is important if you upgrade ownCloud and have non ported 3rd
|
* This is important if you upgrade ownCloud and have non ported 3rd
|
||||||
* party apps installed.
|
* party apps installed.
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
* @throws \Exception
|
||||||
*/
|
*/
|
||||||
private function checkAppsRequirements() {
|
private function checkAppsRequirements() {
|
||||||
$isCoreUpgrade = $this->isCodeUpgrade();
|
$isCoreUpgrade = $this->isCodeUpgrade();
|
||||||
|
@ -447,6 +449,9 @@ class Updater extends BasicEmitter {
|
||||||
return $disabledApps;
|
return $disabledApps;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
private function isCodeUpgrade() {
|
private function isCodeUpgrade() {
|
||||||
$installedVersion = $this->config->getSystemValue('version', '0.0.0');
|
$installedVersion = $this->config->getSystemValue('version', '0.0.0');
|
||||||
$currentVersion = implode('.', OC_Util::getVersion());
|
$currentVersion = implode('.', OC_Util::getVersion());
|
||||||
|
@ -456,7 +461,11 @@ class Updater extends BasicEmitter {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function upgradeAppStoreApps($disabledApps) {
|
/**
|
||||||
|
* @param array $disabledApps
|
||||||
|
* @throws \Exception
|
||||||
|
*/
|
||||||
|
private function upgradeAppStoreApps(array $disabledApps) {
|
||||||
foreach($disabledApps as $app) {
|
foreach($disabledApps as $app) {
|
||||||
if (OC_Installer::isUpdateAvailable($app)) {
|
if (OC_Installer::isUpdateAvailable($app)) {
|
||||||
$ocsId = \OC::$server->getConfig()->getAppValue($app, 'ocsid', '');
|
$ocsId = \OC::$server->getConfig()->getAppValue($app, 'ocsid', '');
|
||||||
|
|
|
@ -1,107 +1,347 @@
|
||||||
<?php
|
<?php
|
||||||
/**
|
/**
|
||||||
* Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
|
* @author Lukas Reschke <lukas@owncloud.com>
|
||||||
* This file is licensed under the Affero General Public License version 3 or
|
* @author Victor Dubiniuk <dubiniuk@owncloud.com>
|
||||||
* later.
|
*
|
||||||
* See the COPYING-README file.
|
* @copyright Copyright (c) 2015, ownCloud, Inc.
|
||||||
|
* @license AGPL-3.0
|
||||||
|
*
|
||||||
|
* This code is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License, version 3,
|
||||||
|
* as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License, version 3,
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OC;
|
namespace OC;
|
||||||
|
|
||||||
class UpdaterTest extends \Test\TestCase {
|
use OCP\IConfig;
|
||||||
|
use OCP\ILogger;
|
||||||
|
|
||||||
public function versionCompatibilityTestData() {
|
class UpdaterTest extends \Test\TestCase {
|
||||||
return array(
|
/** @var IConfig */
|
||||||
array('1.0.0.0', '2.2.0', true),
|
private $config;
|
||||||
array('1.1.1.1', '2.0.0', true),
|
/** @var HTTPHelper */
|
||||||
array('5.0.3', '4.0.3', false),
|
private $httpHelper;
|
||||||
array('12.0.3', '13.4.5', true),
|
/** @var ILogger */
|
||||||
array('1', '2', true),
|
private $logger;
|
||||||
array('2', '2', true),
|
/** @var Updater */
|
||||||
array('6.0.5', '6.0.6', true),
|
private $updater;
|
||||||
array('5.0.6', '7.0.4', false)
|
|
||||||
|
public function setUp() {
|
||||||
|
parent::setUp();
|
||||||
|
$this->config = $this->getMockBuilder('\\OCP\\IConfig')
|
||||||
|
->disableOriginalConstructor()
|
||||||
|
->getMock();
|
||||||
|
$this->httpHelper = $this->getMockBuilder('\\OC\\HTTPHelper')
|
||||||
|
->disableOriginalConstructor()
|
||||||
|
->getMock();
|
||||||
|
$this->logger = $this->getMockBuilder('\\OCP\\ILogger')
|
||||||
|
->disableOriginalConstructor()
|
||||||
|
->getMock();
|
||||||
|
|
||||||
|
$this->updater = new Updater(
|
||||||
|
$this->httpHelper,
|
||||||
|
$this->config,
|
||||||
|
$this->logger
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $baseUrl
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
private function buildUpdateUrl($baseUrl) {
|
||||||
|
return $baseUrl . '?version='.implode('x', \OC_Util::getVersion()).'xinstalledatxlastupdatedatx'.\OC_Util::getChannel().'x'.\OC_Util::getEditionString().'x';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function versionCompatibilityTestData() {
|
||||||
|
return [
|
||||||
|
['1.0.0.0', '2.2.0', true],
|
||||||
|
['1.1.1.1', '2.0.0', true],
|
||||||
|
['5.0.3', '4.0.3', false],
|
||||||
|
['12.0.3', '13.4.5', true],
|
||||||
|
['1', '2', true],
|
||||||
|
['2', '2', true],
|
||||||
|
['6.0.5', '6.0.6', true],
|
||||||
|
['5.0.6', '7.0.4', false],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testSetSimulateStepEnabled() {
|
||||||
|
$this->updater->setSimulateStepEnabled(true);
|
||||||
|
$this->assertSame(true, $this->invokePrivate($this->updater, 'simulateStepEnabled'));
|
||||||
|
$this->updater->setSimulateStepEnabled(false);
|
||||||
|
$this->assertSame(false, $this->invokePrivate($this->updater, 'simulateStepEnabled'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testSetUpdateStepEnabled() {
|
||||||
|
$this->updater->setUpdateStepEnabled(true);
|
||||||
|
$this->assertSame(true, $this->invokePrivate($this->updater, 'updateStepEnabled'));
|
||||||
|
$this->updater->setUpdateStepEnabled(false);
|
||||||
|
$this->assertSame(false, $this->invokePrivate($this->updater, 'updateStepEnabled'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testSetSkip3rdPartyAppsDisable() {
|
||||||
|
$this->updater->setSkip3rdPartyAppsDisable(true);
|
||||||
|
$this->assertSame(true, $this->invokePrivate($this->updater, 'skip3rdPartyAppsDisable'));
|
||||||
|
$this->updater->setSkip3rdPartyAppsDisable(false);
|
||||||
|
$this->assertSame(false, $this->invokePrivate($this->updater, 'skip3rdPartyAppsDisable'));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @dataProvider versionCompatibilityTestData
|
* @dataProvider versionCompatibilityTestData
|
||||||
|
*
|
||||||
|
* @param string $oldVersion
|
||||||
|
* @param string $newVersion
|
||||||
|
* @param bool $result
|
||||||
*/
|
*/
|
||||||
public function testIsUpgradePossible($oldVersion, $newVersion, $result) {
|
public function testIsUpgradePossible($oldVersion, $newVersion, $result) {
|
||||||
$updater = new Updater(\OC::$server->getHTTPHelper(), \OC::$server->getConfig());
|
$updater = new Updater($this->httpHelper, $this->config);
|
||||||
$this->assertSame($result, $updater->isUpgradePossible($oldVersion, $newVersion));
|
$this->assertSame($result, $updater->isUpgradePossible($oldVersion, $newVersion));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testBrokenXmlResponse(){
|
public function testCheckInCache() {
|
||||||
$invalidUpdater = $this->getUpdaterMock('OMG!');
|
$expectedResult = [
|
||||||
$invalidResult = $invalidUpdater->check();
|
'version' => '8.0.4.2',
|
||||||
$this->assertEmpty($invalidResult);
|
'versionstring' => 'ownCloud 8.0.4',
|
||||||
|
'url' => 'https://download.owncloud.org/community/owncloud-8.0.4.zip',
|
||||||
|
'web' => 'http://doc.owncloud.org/server/8.0/admin_manual/maintenance/upgrade.html',
|
||||||
|
];
|
||||||
|
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(0))
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('core', 'lastupdatedat')
|
||||||
|
->will($this->returnValue(time()));
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(1))
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('core', 'lastupdateResult')
|
||||||
|
->will($this->returnValue(json_encode($expectedResult)));
|
||||||
|
|
||||||
|
$this->assertSame($expectedResult, $this->updater->check());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testEmptyResponse(){
|
public function testCheckWithoutUpdateUrl() {
|
||||||
$emptyUpdater = $this->getUpdaterMock('');
|
$expectedResult = [
|
||||||
$emptyResult = $emptyUpdater->check();
|
'version' => '8.0.4.2',
|
||||||
$this->assertEmpty($emptyResult);
|
'versionstring' => 'ownCloud 8.0.4',
|
||||||
|
'url' => 'https://download.owncloud.org/community/owncloud-8.0.4.zip',
|
||||||
|
'web' => 'http://doc.owncloud.org/server/8.0/admin_manual/maintenance/upgrade.html',
|
||||||
|
];
|
||||||
|
|
||||||
// Error while fetching new contents e.g. too many redirects
|
$this->config
|
||||||
$falseUpdater = $this->getUpdaterMock(false);
|
->expects($this->at(0))
|
||||||
$falseResult = $falseUpdater->check();
|
->method('getAppValue')
|
||||||
$this->assertEmpty($falseResult);
|
->with('core', 'lastupdatedat')
|
||||||
}
|
->will($this->returnValue(0));
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(1))
|
||||||
|
->method('setAppValue')
|
||||||
|
->with('core', 'lastupdatedat', time());
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(3))
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('core', 'installedat')
|
||||||
|
->will($this->returnValue('installedat'));
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(4))
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('core', 'lastupdatedat')
|
||||||
|
->will($this->returnValue('lastupdatedat'));
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(5))
|
||||||
|
->method('setAppValue')
|
||||||
|
->with('core', 'lastupdateResult', json_encode($expectedResult));
|
||||||
|
|
||||||
public function testValidEmptyXmlResponse(){
|
$updateXml = '<?xml version="1.0"?>
|
||||||
$updater = $this->getUpdaterMock(
|
|
||||||
'<?xml version="1.0"?><owncloud><version></version><versionstring></versionstring><url></url><web></web></owncloud>'
|
|
||||||
);
|
|
||||||
$result = array_map('strval', $updater->check());
|
|
||||||
|
|
||||||
$this->assertArrayHasKey('version', $result);
|
|
||||||
$this->assertArrayHasKey('versionstring', $result);
|
|
||||||
$this->assertArrayHasKey('url', $result);
|
|
||||||
$this->assertArrayHasKey('web', $result);
|
|
||||||
$this->assertEmpty($result['version']);
|
|
||||||
$this->assertEmpty($result['versionstring']);
|
|
||||||
$this->assertEmpty($result['url']);
|
|
||||||
$this->assertEmpty($result['web']);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testValidUpdateResponse(){
|
|
||||||
$newUpdater = $this->getUpdaterMock(
|
|
||||||
'<?xml version="1.0"?>
|
|
||||||
<owncloud>
|
<owncloud>
|
||||||
<version>7.0.3.4</version>
|
<version>8.0.4.2</version>
|
||||||
<versionstring>ownCloud 7.0.3</versionstring>
|
<versionstring>ownCloud 8.0.4</versionstring>
|
||||||
<url>http://download.owncloud.org/community/owncloud-7.0.3.zip</url>
|
<url>https://download.owncloud.org/community/owncloud-8.0.4.zip</url>
|
||||||
<web>http://owncloud.org/</web>
|
<web>http://doc.owncloud.org/server/8.0/admin_manual/maintenance/upgrade.html</web>
|
||||||
</owncloud>'
|
</owncloud>';
|
||||||
);
|
$this->httpHelper
|
||||||
$newResult = array_map('strval', $newUpdater->check());
|
->expects($this->once())
|
||||||
|
->method('getUrlContent')
|
||||||
|
->with($this->buildUpdateUrl('https://updates.owncloud.com/server/'))
|
||||||
|
->will($this->returnValue($updateXml));
|
||||||
|
|
||||||
$this->assertArrayHasKey('version', $newResult);
|
$this->assertSame($expectedResult, $this->updater->check());
|
||||||
$this->assertArrayHasKey('versionstring', $newResult);
|
|
||||||
$this->assertArrayHasKey('url', $newResult);
|
|
||||||
$this->assertArrayHasKey('web', $newResult);
|
|
||||||
$this->assertEquals('7.0.3.4', $newResult['version']);
|
|
||||||
$this->assertEquals('ownCloud 7.0.3', $newResult['versionstring']);
|
|
||||||
$this->assertEquals('http://download.owncloud.org/community/owncloud-7.0.3.zip', $newResult['url']);
|
|
||||||
$this->assertEquals('http://owncloud.org/', $newResult['web']);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function getUpdaterMock($content){
|
public function testCheckWithInvalidXml() {
|
||||||
// Invalidate cache
|
$this->config
|
||||||
$mockedConfig = $this->getMockBuilder('\OCP\IConfig')
|
->expects($this->at(0))
|
||||||
->disableOriginalConstructor()
|
->method('getAppValue')
|
||||||
->getMock()
|
->with('core', 'lastupdatedat')
|
||||||
;
|
->will($this->returnValue(0));
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(1))
|
||||||
|
->method('setAppValue')
|
||||||
|
->with('core', 'lastupdatedat', time());
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(3))
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('core', 'installedat')
|
||||||
|
->will($this->returnValue('installedat'));
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(4))
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('core', 'lastupdatedat')
|
||||||
|
->will($this->returnValue('lastupdatedat'));
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(5))
|
||||||
|
->method('setAppValue')
|
||||||
|
->with('core', 'lastupdateResult', 'false');
|
||||||
|
|
||||||
$clientService = $this->getMock('\OCP\Http\Client\IClientService');
|
$updateXml = 'Invalid XML Response!';
|
||||||
$mockedHTTPHelper = $this->getMockBuilder('\OC\HTTPHelper')
|
$this->httpHelper
|
||||||
->setConstructorArgs([\OC::$server->getConfig(), $clientService])
|
->expects($this->once())
|
||||||
->getMock()
|
->method('getUrlContent')
|
||||||
;
|
->with($this->buildUpdateUrl('https://updates.owncloud.com/server/'))
|
||||||
|
->will($this->returnValue($updateXml));
|
||||||
|
|
||||||
$mockedHTTPHelper->expects($this->once())->method('getUrlContent')->will($this->returnValue($content));
|
$this->assertSame([], $this->updater->check());
|
||||||
|
|
||||||
return new Updater($mockedHTTPHelper, $mockedConfig);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testCheckWithUpdateUrl() {
|
||||||
|
$expectedResult = [
|
||||||
|
'version' => '8.0.4.2',
|
||||||
|
'versionstring' => 'ownCloud 8.0.4',
|
||||||
|
'url' => 'https://download.owncloud.org/community/owncloud-8.0.4.zip',
|
||||||
|
'web' => 'http://doc.owncloud.org/server/8.0/admin_manual/maintenance/upgrade.html',
|
||||||
|
];
|
||||||
|
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(0))
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('core', 'lastupdatedat')
|
||||||
|
->will($this->returnValue(0));
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(1))
|
||||||
|
->method('setAppValue')
|
||||||
|
->with('core', 'lastupdatedat', time());
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(3))
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('core', 'installedat')
|
||||||
|
->will($this->returnValue('installedat'));
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(4))
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('core', 'lastupdatedat')
|
||||||
|
->will($this->returnValue('lastupdatedat'));
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(5))
|
||||||
|
->method('setAppValue')
|
||||||
|
->with('core', 'lastupdateResult', json_encode($expectedResult));
|
||||||
|
|
||||||
|
$updateXml = '<?xml version="1.0"?>
|
||||||
|
<owncloud>
|
||||||
|
<version>8.0.4.2</version>
|
||||||
|
<versionstring>ownCloud 8.0.4</versionstring>
|
||||||
|
<url>https://download.owncloud.org/community/owncloud-8.0.4.zip</url>
|
||||||
|
<web>http://doc.owncloud.org/server/8.0/admin_manual/maintenance/upgrade.html</web>
|
||||||
|
</owncloud>';
|
||||||
|
$this->httpHelper
|
||||||
|
->expects($this->once())
|
||||||
|
->method('getUrlContent')
|
||||||
|
->with($this->buildUpdateUrl('https://myupdater.com/'))
|
||||||
|
->will($this->returnValue($updateXml));
|
||||||
|
|
||||||
|
$this->assertSame($expectedResult, $this->updater->check('https://myupdater.com/'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCheckWithEmptyValidXmlResponse() {
|
||||||
|
$expectedResult = [
|
||||||
|
'version' => '',
|
||||||
|
'versionstring' => '',
|
||||||
|
'url' => '',
|
||||||
|
'web' => '',
|
||||||
|
];
|
||||||
|
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(0))
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('core', 'lastupdatedat')
|
||||||
|
->will($this->returnValue(0));
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(1))
|
||||||
|
->method('setAppValue')
|
||||||
|
->with('core', 'lastupdatedat', time());
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(3))
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('core', 'installedat')
|
||||||
|
->will($this->returnValue('installedat'));
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(4))
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('core', 'lastupdatedat')
|
||||||
|
->will($this->returnValue('lastupdatedat'));
|
||||||
|
|
||||||
|
$updateXml = '<?xml version="1.0"?>
|
||||||
|
<owncloud>
|
||||||
|
<version></version>
|
||||||
|
<versionstring></versionstring>
|
||||||
|
<url></url>
|
||||||
|
<web></web>
|
||||||
|
</owncloud>';
|
||||||
|
$this->httpHelper
|
||||||
|
->expects($this->once())
|
||||||
|
->method('getUrlContent')
|
||||||
|
->with($this->buildUpdateUrl('https://updates.owncloud.com/server/'))
|
||||||
|
->will($this->returnValue($updateXml));
|
||||||
|
|
||||||
|
$this->assertSame($expectedResult, $this->updater->check());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCheckWithEmptyInvalidXmlResponse() {
|
||||||
|
$expectedResult = [];
|
||||||
|
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(0))
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('core', 'lastupdatedat')
|
||||||
|
->will($this->returnValue(0));
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(1))
|
||||||
|
->method('setAppValue')
|
||||||
|
->with('core', 'lastupdatedat', time());
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(3))
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('core', 'installedat')
|
||||||
|
->will($this->returnValue('installedat'));
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(4))
|
||||||
|
->method('getAppValue')
|
||||||
|
->with('core', 'lastupdatedat')
|
||||||
|
->will($this->returnValue('lastupdatedat'));
|
||||||
|
$this->config
|
||||||
|
->expects($this->at(5))
|
||||||
|
->method('setAppValue')
|
||||||
|
->with('core', 'lastupdateResult', json_encode($expectedResult));
|
||||||
|
|
||||||
|
$updateXml = '';
|
||||||
|
$this->httpHelper
|
||||||
|
->expects($this->once())
|
||||||
|
->method('getUrlContent')
|
||||||
|
->with($this->buildUpdateUrl('https://updates.owncloud.com/server/'))
|
||||||
|
->will($this->returnValue($updateXml));
|
||||||
|
|
||||||
|
$this->assertSame($expectedResult, $this->updater->check());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue