summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-01-19 14:00:27 +0100
committerMorris Jobke <hey@morrisjobke.de>2018-01-19 14:00:27 +0100
commitc70927eaa0d558575ee63b149005ae9ed17e88df (patch)
tree077f02eba8ad1f50e332c29a47efd4b09fc6f5ba /tests
parentfdd7a5325006d5ff023f04fab32627e08393f053 (diff)
downloadnextcloud-server-c70927eaa0d558575ee63b149005ae9ed17e88df.tar.gz
nextcloud-server-c70927eaa0d558575ee63b149005ae9ed17e88df.zip
Remove not needed 3rdparty app disabling during upgrade for PHP 5.x
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/AppFramework/Http/JSONResponseTest.php1
-rw-r--r--tests/lib/UpdaterTest.php7
2 files changed, 0 insertions, 8 deletions
diff --git a/tests/lib/AppFramework/Http/JSONResponseTest.php b/tests/lib/AppFramework/Http/JSONResponseTest.php
index 23a55e7eee8..3c3a273a97e 100644
--- a/tests/lib/AppFramework/Http/JSONResponseTest.php
+++ b/tests/lib/AppFramework/Http/JSONResponseTest.php
@@ -93,7 +93,6 @@ class JSONResponseTest extends \Test\TestCase {
/**
* @expectedException \Exception
* @expectedExceptionMessage Could not json_encode due to invalid non UTF-8 characters in the array: array (
- * @requires PHP 5.5
*/
public function testRenderWithNonUtf8Encoding() {
$params = ['test' => hex2bin('e9')];
diff --git a/tests/lib/UpdaterTest.php b/tests/lib/UpdaterTest.php
index a6a8224ac34..afc9f9b1f86 100644
--- a/tests/lib/UpdaterTest.php
+++ b/tests/lib/UpdaterTest.php
@@ -115,11 +115,4 @@ class UpdaterTest extends TestCase {
$this->assertSame($result, $this->updater->isUpgradePossible($oldVersion, $newVersion, $allowedVersions));
}
- 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'));
- }
-
}