Fix app version check

Signed-off-by: Joas Schilling <coding@schilljs.com>

2 files changed, 17 insertions, 27 deletions

diff --git a/tests/Core/Command/Apps/AppsDisableTest.php b/tests/Core/Command/Apps/AppsDisableTest.php
index c94e3351b91..79dd9c59bbf 100644
--- a/tests/Core/Command/Apps/AppsDisableTest.php
+++ b/tests/Core/Command/Apps/AppsDisableTest.php
@@ -68,19 +68,18 @@ class AppsDisableTest extends TestCase {
 
 	public function dataCommandInput(): array {
 		return [
-			[['admin_audit'], 0, 'admin_audit 1.11.0 disabled'],
-			[['comments'], 0, 'comments 1.11.0 disabled'],
+			[['admin_audit'], 0, 'admin_audit 1.12.0 disabled'],
+			[['comments'], 0, 'comments 1.12.0 disabled'],
 			[['invalid_app'], 0, 'No such app enabled: invalid_app'],
 
-			[['admin_audit', 'comments'], 0, "admin_audit 1.11.0 disabled\ncomments 1.11.0 disabled"],
-			[['admin_audit', 'comments', 'invalid_app'], 0, "admin_audit 1.11.0 disabled\ncomments 1.11.0 disabled\nNo such app enabled: invalid_app"],
+			[['admin_audit', 'comments'], 0, "admin_audit 1.12.0 disabled\ncomments 1.12.0 disabled"],
+			[['admin_audit', 'comments', 'invalid_app'], 0, "admin_audit 1.12.0 disabled\ncomments 1.12.0 disabled\nNo such app enabled: invalid_app"],
 
 			[['files'], 2, "files can't be disabled"],
 			[['provisioning_api'], 2, "provisioning_api can't be disabled"],
 
-			[['files', 'admin_audit'], 2, "files can't be disabled.\nadmin_audit 1.11.0 disabled"],
-			[['provisioning_api', 'comments'], 2, "provisioning_api can't be disabled.\ncomments 1.11.0 disabled"],
-
+			[['files', 'admin_audit'], 2, "files can't be disabled.\nadmin_audit 1.12.0 disabled"],
+			[['provisioning_api', 'comments'], 2, "provisioning_api can't be disabled.\ncomments 1.12.0 disabled"],
 		];
 	}
 }
diff --git a/tests/Core/Command/Apps/AppsEnableTest.php b/tests/Core/Command/Apps/AppsEnableTest.php
index 2fa9240b4eb..0924edffc35 100644
--- a/tests/Core/Command/Apps/AppsEnableTest.php
+++ b/tests/Core/Command/Apps/AppsEnableTest.php
@@ -72,33 +72,24 @@ class AppsEnableTest extends TestCase {
 	}
 
 	public function dataCommandInput(): array {
-		$data = [
-			[['admin_audit'], null, 0, 'admin_audit 1.11.0 enabled'],
-			[['comments'], null, 0, 'comments 1.11.0 enabled'],
-			[['comments', 'comments'], null, 0, "comments 1.11.0 enabled\ncomments already enabled"],
+		return [
+			[['admin_audit'], null, 0, 'admin_audit 1.12.0 enabled'],
+			[['comments'], null, 0, 'comments 1.12.0 enabled'],
+			[['comments', 'comments'], null, 0, "comments 1.12.0 enabled\ncomments already enabled"],
 			[['invalid_app'], null, 1, 'Could not download app invalid_app'],
 
-			[['admin_audit', 'comments'], null, 0, "admin_audit 1.11.0 enabled\ncomments 1.11.0 enabled"],
-			[['admin_audit', 'comments', 'invalid_app'], null, 1, "admin_audit 1.11.0 enabled\ncomments 1.11.0 enabled\nCould not download app invalid_app"],
+			[['admin_audit', 'comments'], null, 0, "admin_audit 1.12.0 enabled\ncomments 1.12.0 enabled"],
+			[['admin_audit', 'comments', 'invalid_app'], null, 1, "admin_audit 1.12.0 enabled\ncomments 1.12.0 enabled\nCould not download app invalid_app"],
 
 			[['admin_audit'], ['admin'], 1, "admin_audit can't be enabled for groups"],
 			[['comments'], ['admin'], 1, "comments can't be enabled for groups"],
 
-			[['updatenotification'], ['admin'], 0, 'updatenotification 1.11.0 enabled for groups: admin'],
-			[['updatenotification', 'accessibility'], ['admin'], 0, "updatenotification 1.11.0 enabled for groups: admin\naccessibility 1.7.0 enabled for groups: admin"],
+			[['updatenotification'], ['admin'], 0, 'updatenotification 1.12.0 enabled for groups: admin'],
+			[['updatenotification', 'accessibility'], ['admin'], 0, "updatenotification 1.12.0 enabled for groups: admin\naccessibility 1.8.0 enabled for groups: admin"],
 
-			[['updatenotification'], ['admin', 'invalid_group'], 0, 'updatenotification 1.11.0 enabled for groups: admin'],
-			[['updatenotification', 'accessibility'], ['admin', 'invalid_group'], 0, "updatenotification 1.11.0 enabled for groups: admin\naccessibility 1.7.0 enabled for groups: admin"],
-			[['updatenotification', 'accessibility', 'invalid_app'], ['admin', 'invalid_group'], 1, "updatenotification 1.11.0 enabled for groups: admin\naccessibility 1.7.0 enabled for groups: admin\nCould not download app invalid_app"],
+			[['updatenotification'], ['admin', 'invalid_group'], 0, 'updatenotification 1.12.0 enabled for groups: admin'],
+			[['updatenotification', 'accessibility'], ['admin', 'invalid_group'], 0, "updatenotification 1.12.0 enabled for groups: admin\naccessibility 1.8.0 enabled for groups: admin"],
+			[['updatenotification', 'accessibility', 'invalid_app'], ['admin', 'invalid_group'], 1, "updatenotification 1.12.0 enabled for groups: admin\naccessibility 1.8.0 enabled for groups: admin\nCould not download app invalid_app"],
 		];
-
-		if (getenv('CI') === false) {
-			/** Tests disabled on drone/ci due to appstore dependency */
-			$data[] = [['updatenotification', 'contacts'], ['admin'], 0, "updatenotification 1.11.0 enabled for groups: admin\ncontacts 3.3.0 enabled for groups: admin"];
-			$data[] = [['updatenotification', 'contacts'], ['admin', 'invalid_group'], 0, "updatenotification enabled for groups: admin\ncontacts 3.3.0 enabled for groups: admin"];
-			$data[] = [['updatenotification', 'contacts', 'invalid_app'], ['admin', 'invalid_group'], 1, "updatenotification enabled for groups: admin\ncontacts enabled for groups: admin\nCould not download app invalid_app"];
-		}
-
-		return $data;
 	}
 }