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

Merge pull request #18752 from owncloud/proper-setup-check 

use config.php value instead of version string for appstore detection
This commit is contained in:
Morris Jobke 2015-09-02 10:36:19 +02:00
parent 73b43db4f9 c86cac6a2b
commit 0884211c0f
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
settings/controller/checksetupcontroller.php
View File

@ -143,7 +143,7 @@ class CheckSetupController extends Controller {
}
$features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
if(OC_Util::getEditionString() !== '') {
if(!$this->config->getSystemValue('appstoreenabled', true)) {
$features = (string)$this->l10n->t('Federated Cloud Sharing');
}

28
tests/settings/controller/CheckSetupControllerTest.php
View File

@ -384,6 +384,11 @@ class CheckSetupControllerTest extends TestCase {
}
public function testIsUsedTlsLibOutdatedWithOlderOpenSsl() {
$this->config
->expects($this->once())
->method('getSystemValue')
->with('appstoreenabled', true)
->will($this->returnValue(true));
$this->checkSetupController
->expects($this->once())
->method('getCurlVersion')
@ -391,7 +396,25 @@ class CheckSetupControllerTest extends TestCase {
$this->assertSame('cURL is using an outdated OpenSSL version (OpenSSL/1.0.1c). Please update your operating system or features such as installing and updating apps via the app store or Federated Cloud Sharing will not work reliably.', $this->invokePrivate($this->checkSetupController, 'isUsedTlsLibOutdated'));
}
public function testIsUsedTlsLibOutdatedWithOlderOpenSslAndWithoutAppstore() {
$this->config
->expects($this->once())
->method('getSystemValue')
->with('appstoreenabled', true)
->will($this->returnValue(false));
$this->checkSetupController
->expects($this->once())
->method('getCurlVersion')
->will($this->returnValue(['ssl_version' => 'OpenSSL/1.0.1c']));
$this->assertSame('cURL is using an outdated OpenSSL version (OpenSSL/1.0.1c). Please update your operating system or features such as Federated Cloud Sharing will not work reliably.', $this->invokePrivate($this->checkSetupController, 'isUsedTlsLibOutdated'));
}
public function testIsUsedTlsLibOutdatedWithOlderOpenSsl1() {
$this->config
->expects($this->once())
->method('getSystemValue')
->with('appstoreenabled', true)
->will($this->returnValue(true));
$this->checkSetupController
->expects($this->once())
->method('getCurlVersion')
@ -416,6 +439,11 @@ class CheckSetupControllerTest extends TestCase {
}
public function testIsBuggyNss400() {
$this->config
->expects($this->once())
->method('getSystemValue')
->with('appstoreenabled', true)
->will($this->returnValue(true));
$this->checkSetupController
->expects($this->once())
->method('getCurlVersion')