From 7c0951244a176e0b42d2d66a4288d74460821a8c Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 6 Sep 2016 14:11:30 +0200 Subject: Deprecate getEditionString() --- tests/Settings/Controller/CheckSetupControllerTest.php | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'tests/Settings/Controller/CheckSetupControllerTest.php') 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)) -- cgit v1.2.3