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 | |
| parent | 836c938583a2709adb21cdaafb3f000e8c77a086 (diff) | |
| download | nextcloud-server-7c0951244a176e0b42d2d66a4288d74460821a8c.tar.gz nextcloud-server-7c0951244a176e0b42d2d66a4288d74460821a8c.zip | |
Deprecate getEditionString()
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Settings/Controller/CheckSetupControllerTest.php | 16 | ||||
| -rw-r--r-- | tests/lib/Updater/VersionCheckTest.php | 2 | ||||
| -rw-r--r-- | tests/lib/UpdaterTest.php | 2 |
3 files changed, 4 insertions, 16 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)) diff --git a/tests/lib/Updater/VersionCheckTest.php b/tests/lib/Updater/VersionCheckTest.php index fb43571cece..5283ca9c555 100644 --- a/tests/lib/Updater/VersionCheckTest.php +++ b/tests/lib/Updater/VersionCheckTest.php @@ -50,7 +50,7 @@ class VersionCheckTest extends \Test\TestCase { * @return string */ private function buildUpdateUrl($baseUrl) { - return $baseUrl . '?version='.implode('x', Util::getVersion()).'xinstalledatxlastupdatedatx'.\OC_Util::getChannel().'x'.\OC_Util::getEditionString().'x'; + return $baseUrl . '?version='.implode('x', Util::getVersion()).'xinstalledatxlastupdatedatx'.\OC_Util::getChannel().'xx'; } public function testCheckInCache() { diff --git a/tests/lib/UpdaterTest.php b/tests/lib/UpdaterTest.php index e45a9f08243..0c67a3f7433 100644 --- a/tests/lib/UpdaterTest.php +++ b/tests/lib/UpdaterTest.php @@ -61,7 +61,7 @@ class UpdaterTest extends \Test\TestCase { * @return string */ private function buildUpdateUrl($baseUrl) { - return $baseUrl . '?version='.implode('x', \OCP\Util::getVersion()).'xinstalledatxlastupdatedatx'.\OC_Util::getChannel().'x'.\OC_Util::getEditionString().'x'; + return $baseUrl . '?version='.implode('x', \OCP\Util::getVersion()).'xinstalledatxlastupdatedatx'.\OC_Util::getChannel().'xx'; } /** |