diff options
author | Joas Schilling <coding@schilljs.com> | 2016-09-06 14:11:30 +0200 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2016-09-06 16:05:28 +0200 |
commit | 7c0951244a176e0b42d2d66a4288d74460821a8c (patch) | |
tree | 3324f36c7f0f7b5a8a85cc8f3ab910af46b3b2f8 /tests/Settings | |
parent | 836c938583a2709adb21cdaafb3f000e8c77a086 (diff) | |
download | nextcloud-server-7c0951244a176e0b42d2d66a4288d74460821a8c.tar.gz nextcloud-server-7c0951244a176e0b42d2d66a4288d74460821a8c.zip |
Deprecate getEditionString()
Diffstat (limited to 'tests/Settings')
-rw-r--r-- | tests/Settings/Controller/CheckSetupControllerTest.php | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/tests/Settings/Controller/CheckSetupControllerTest.php b/tests/Settings/Controller/CheckSetupControllerTest.php index e4f66b5d879..c465ee79ed1 100644 --- a/tests/Settings/Controller/CheckSetupControllerTest.php +++ b/tests/Settings/Controller/CheckSetupControllerTest.php @@ -508,12 +508,6 @@ class CheckSetupControllerTest extends TestCase { } public function testIsUsedTlsLibOutdatedWithAppstoreDisabledAndServerToServerSharingEnabled() { - // Appstore is disabled by default in EE - $appStoreDefault = false; - if (\OC_Util::getEditionString() === '') { - $appStoreDefault = true; - } - $this->config ->expects($this->at(0)) ->method('getSystemValue') @@ -522,7 +516,7 @@ class CheckSetupControllerTest extends TestCase { $this->config ->expects($this->at(1)) ->method('getSystemValue') - ->with('appstoreenabled', $appStoreDefault) + ->with('appstoreenabled', true) ->will($this->returnValue(false)); $this->config ->expects($this->at(2)) @@ -543,12 +537,6 @@ class CheckSetupControllerTest extends TestCase { } public function testIsUsedTlsLibOutdatedWithAppstoreDisabledAndServerToServerSharingDisabled() { - // Appstore is disabled by default in EE - $appStoreDefault = false; - if (\OC_Util::getEditionString() === '') { - $appStoreDefault = true; - } - $this->config ->expects($this->at(0)) ->method('getSystemValue') @@ -557,7 +545,7 @@ class CheckSetupControllerTest extends TestCase { $this->config ->expects($this->at(1)) ->method('getSystemValue') - ->with('appstoreenabled', $appStoreDefault) + ->with('appstoreenabled', true) ->will($this->returnValue(false)); $this->config ->expects($this->at(2)) |