summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/comments/appinfo/info.xml1
-rw-r--r--apps/contactsinteraction/appinfo/info.xml1
-rw-r--r--apps/dashboard/appinfo/info.xml1
-rw-r--r--apps/dav/appinfo/info.xml1
-rw-r--r--apps/federation/appinfo/info.xml1
-rw-r--r--apps/files/appinfo/info.xml1
-rw-r--r--apps/files_sharing/appinfo/info.xml1
-rw-r--r--apps/files_trashbin/appinfo/info.xml1
-rw-r--r--apps/files_versions/appinfo/info.xml1
-rw-r--r--apps/lookup_server_connector/appinfo/info.xml1
-rw-r--r--apps/oauth2/appinfo/info.xml1
-rw-r--r--apps/provisioning_api/appinfo/info.xml1
-rw-r--r--apps/settings/appinfo/info.xml1
-rw-r--r--apps/sharebymail/appinfo/info.xml1
-rw-r--r--apps/systemtags/appinfo/info.xml1
-rw-r--r--apps/theming/appinfo/info.xml1
-rw-r--r--apps/updatenotification/appinfo/info.xml1
-rw-r--r--apps/updatenotification/tests/Settings/AdminTest.php43
-rw-r--r--apps/user_status/appinfo/info.xml1
-rw-r--r--apps/weather_status/appinfo/info.xml1
20 files changed, 24 insertions, 38 deletions
diff --git a/apps/comments/appinfo/info.xml b/apps/comments/appinfo/info.xml
index 88f780cf7de..70a1695b923 100644
--- a/apps/comments/appinfo/info.xml
+++ b/apps/comments/appinfo/info.xml
@@ -9,7 +9,6 @@
<licence>agpl</licence>
<author>Arthur Schiwon</author>
<author>Vincent Petry</author>
- <default_enable/>
<types>
<logging/>
</types>
diff --git a/apps/contactsinteraction/appinfo/info.xml b/apps/contactsinteraction/appinfo/info.xml
index 8ea086712c0..2f52ff2c030 100644
--- a/apps/contactsinteraction/appinfo/info.xml
+++ b/apps/contactsinteraction/appinfo/info.xml
@@ -13,7 +13,6 @@
<types>
<dav/>
</types>
- <default_enable/>
<category>integration</category>
<category>social</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
diff --git a/apps/dashboard/appinfo/info.xml b/apps/dashboard/appinfo/info.xml
index a21f3ab47b1..5969c5d1dee 100644
--- a/apps/dashboard/appinfo/info.xml
+++ b/apps/dashboard/appinfo/info.xml
@@ -14,7 +14,6 @@ they like and change the background to their liking.]]></description>
<licence>agpl</licence>
<author>Julius Härtl</author>
<namespace>Dashboard</namespace>
- <default_enable/>
<category>customization</category>
diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index deb99b1c33b..02fbe970c47 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -9,7 +9,6 @@
<licence>agpl</licence>
<author>owncloud.org</author>
<namespace>DAV</namespace>
- <default_enable/>
<types>
<filesystem/>
</types>
diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml
index 67280335769..263ffad2092 100644
--- a/apps/federation/appinfo/info.xml
+++ b/apps/federation/appinfo/info.xml
@@ -9,7 +9,6 @@
<licence>agpl</licence>
<author>Bjoern Schiessle</author>
<namespace>Federation</namespace>
- <default_enable/>
<types>
<authentication/>
diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index f62a913e8f4..6c8c043cd2c 100644
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -9,7 +9,6 @@
<licence>agpl</licence>
<author>Robin Appelman</author>
<author>Vincent Petry</author>
- <default_enable/>
<types>
<filesystem/>
</types>
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 44f3e3a45cd..66c49d6eeb6 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -14,7 +14,6 @@ Turning the feature off removes shared files and folders on the server for all s
<author>Michael Gapczynski</author>
<author>Bjoern Schiessle</author>
<namespace>Files_Sharing</namespace>
- <default_enable/>
<types>
<filesystem/>
</types>
diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml
index b8f4b5ea6b1..f63953ade9b 100644
--- a/apps/files_trashbin/appinfo/info.xml
+++ b/apps/files_trashbin/appinfo/info.xml
@@ -13,7 +13,6 @@ To prevent a user from running out of disk space, the Deleted files app will not
<licence>agpl</licence>
<author>Bjoern Schiessle</author>
<namespace>Files_Trashbin</namespace>
- <default_enable/>
<types>
<filesystem/>
<dav/>
diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index 49e48e6e436..bdd699d620c 100644
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -13,7 +13,6 @@
<author>Frank Karlitschek</author>
<author>Bjoern Schiessle</author>
<namespace>Files_Versions</namespace>
- <default_enable/>
<types>
<filesystem/>
<dav/>
diff --git a/apps/lookup_server_connector/appinfo/info.xml b/apps/lookup_server_connector/appinfo/info.xml
index cf486e06228..5cc54c7e9f2 100644
--- a/apps/lookup_server_connector/appinfo/info.xml
+++ b/apps/lookup_server_connector/appinfo/info.xml
@@ -9,7 +9,6 @@
<licence>agpl</licence>
<author>Bjoern Schiessle</author>
<namespace>LookupServerConnector</namespace>
- <default_enable/>
<types>
<authentication/>
</types>
diff --git a/apps/oauth2/appinfo/info.xml b/apps/oauth2/appinfo/info.xml
index ae2fcb09986..6eed9b9d18e 100644
--- a/apps/oauth2/appinfo/info.xml
+++ b/apps/oauth2/appinfo/info.xml
@@ -9,7 +9,6 @@
<licence>agpl</licence>
<author>Lukas Reschke</author>
<namespace>OAuth2</namespace>
- <default_enable/>
<types>
<authentication/>
</types>
diff --git a/apps/provisioning_api/appinfo/info.xml b/apps/provisioning_api/appinfo/info.xml
index dd01689950a..56dc6e610d4 100644
--- a/apps/provisioning_api/appinfo/info.xml
+++ b/apps/provisioning_api/appinfo/info.xml
@@ -17,7 +17,6 @@
<licence>agpl</licence>
<author>Tom Needham</author>
<namespace>Provisioning_API</namespace>
- <default_enable/>
<types>
<prevent_group_restriction/>
</types>
diff --git a/apps/settings/appinfo/info.xml b/apps/settings/appinfo/info.xml
index 13e5eddcdf2..f030c1e5c50 100644
--- a/apps/settings/appinfo/info.xml
+++ b/apps/settings/appinfo/info.xml
@@ -9,7 +9,6 @@
<licence>agpl</licence>
<author>Nextcloud</author>
<namespace>Settings</namespace>
- <default_enable/>
<category>customization</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
diff --git a/apps/sharebymail/appinfo/info.xml b/apps/sharebymail/appinfo/info.xml
index f4d2900c80d..70458f44d19 100644
--- a/apps/sharebymail/appinfo/info.xml
+++ b/apps/sharebymail/appinfo/info.xml
@@ -9,7 +9,6 @@
<licence>agpl</licence>
<author>Bjoern Schiessle</author>
<namespace>ShareByMail</namespace>
- <default_enable/>
<types>
<filesystem/>
diff --git a/apps/systemtags/appinfo/info.xml b/apps/systemtags/appinfo/info.xml
index 9e0b347acbd..1f572a831d6 100644
--- a/apps/systemtags/appinfo/info.xml
+++ b/apps/systemtags/appinfo/info.xml
@@ -11,7 +11,6 @@
<author>Vincent Petry</author>
<author>Joas Schilling</author>
<namespace>SystemTags</namespace>
- <default_enable/>
<types>
<logging/>
</types>
diff --git a/apps/theming/appinfo/info.xml b/apps/theming/appinfo/info.xml
index b67b461c410..6823a9fbd88 100644
--- a/apps/theming/appinfo/info.xml
+++ b/apps/theming/appinfo/info.xml
@@ -9,7 +9,6 @@
<licence>agpl</licence>
<author>Nextcloud</author>
<namespace>Theming</namespace>
- <default_enable/>
<types>
<logging/>
diff --git a/apps/updatenotification/appinfo/info.xml b/apps/updatenotification/appinfo/info.xml
index 44fa6b9c50f..626316f04aa 100644
--- a/apps/updatenotification/appinfo/info.xml
+++ b/apps/updatenotification/appinfo/info.xml
@@ -9,7 +9,6 @@
<licence>agpl</licence>
<author>Lukas Reschke</author>
<namespace>UpdateNotification</namespace>
- <default_enable/>
<category>monitoring</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
diff --git a/apps/updatenotification/tests/Settings/AdminTest.php b/apps/updatenotification/tests/Settings/AdminTest.php
index 489679dfabd..784e56e79ed 100644
--- a/apps/updatenotification/tests/Settings/AdminTest.php
+++ b/apps/updatenotification/tests/Settings/AdminTest.php
@@ -42,6 +42,7 @@ use OCP\L10N\ILanguageIterator;
use OCP\Support\Subscription\IRegistry;
use OCP\UserInterface;
use OCP\User\Backend\ICountUsersBackend;
+use OCP\AppFramework\Services\IInitialState;
use OCP\Util;
use OC\User\Backend;
use Psr\Log\LoggerInterface;
@@ -66,6 +67,8 @@ class AdminTest extends TestCase {
private $userManager;
/** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
private $logger;
+ /** IInitialState|\PHPUnit\Framework\MockObject\MockObject */
+ private $initialState;
protected function setUp(): void {
parent::setUp();
@@ -78,6 +81,7 @@ class AdminTest extends TestCase {
$this->subscriptionRegistry = $this->createMock(IRegistry::class);
$this->userManager = $this->createMock(IUserManager::class);
$this->logger = $this->createMock(LoggerInterface::class);
+ $this->initialState = $this->createMock(IInitialState::class);
$this->admin = new Admin(
$this->config,
@@ -87,7 +91,8 @@ class AdminTest extends TestCase {
$this->l10nFactory,
$this->subscriptionRegistry,
$this->userManager,
- $this->logger
+ $this->logger,
+ $this->initialState
);
}
@@ -187,8 +192,9 @@ class AdminTest extends TestCase {
->method('delegateHasValidSubscription')
->willReturn(true);
- $params = [
- 'json' => json_encode([
+ $this->initialState->expects($this->once())
+ ->method('provideInitialState')
+ ->with('data', [
'isNewVersionAvailable' => true,
'isUpdateChecked' => true,
'lastChecked' => 'LastCheckedReturnValue',
@@ -205,13 +211,12 @@ class AdminTest extends TestCase {
'isDefaultUpdateServerURL' => true,
'updateServerURL' => 'https://updates.nextcloud.com/updater_server/',
'notifyGroups' => [
- ['value' => 'admin', 'label' => 'Administrators'],
+ ['id' => 'admin', 'displayname' => 'Administrators'],
],
'hasValidSubscription' => true,
- ]),
- ];
+ ]);
- $expected = new TemplateResponse('updatenotification', 'admin', $params, '');
+ $expected = new TemplateResponse('updatenotification', 'admin', [], '');
$this->assertEquals($expected, $this->admin->getForm());
}
@@ -311,8 +316,9 @@ class AdminTest extends TestCase {
->method('delegateHasValidSubscription')
->willReturn(true);
- $params = [
- 'json' => json_encode([
+ $this->initialState->expects($this->once())
+ ->method('provideInitialState')
+ ->with('data', [
'isNewVersionAvailable' => true,
'isUpdateChecked' => true,
'lastChecked' => 'LastCheckedReturnValue',
@@ -329,13 +335,12 @@ class AdminTest extends TestCase {
'isDefaultUpdateServerURL' => false,
'updateServerURL' => 'https://updates.nextcloud.com/updater_server_changed/',
'notifyGroups' => [
- ['value' => 'admin', 'label' => 'Administrators'],
+ ['id' => 'admin', 'displayname' => 'Administrators'],
],
'hasValidSubscription' => true,
- ]),
- ];
+ ]);
- $expected = new TemplateResponse('updatenotification', 'admin', $params, '');
+ $expected = new TemplateResponse('updatenotification', 'admin', [], '');
$this->assertEquals($expected, $this->admin->getForm());
}
@@ -435,8 +440,9 @@ class AdminTest extends TestCase {
->method('delegateHasValidSubscription')
->willReturn(true);
- $params = [
- 'json' => json_encode([
+ $this->initialState->expects($this->once())
+ ->method('provideInitialState')
+ ->with('data', [
'isNewVersionAvailable' => true,
'isUpdateChecked' => true,
'lastChecked' => 'LastCheckedReturnValue',
@@ -453,13 +459,12 @@ class AdminTest extends TestCase {
'isDefaultUpdateServerURL' => true,
'updateServerURL' => 'https://updates.nextcloud.com/customers/ABC-DEF/',
'notifyGroups' => [
- ['value' => 'admin', 'label' => 'Administrators'],
+ ['id' => 'admin', 'displayname' => 'Administrators'],
],
'hasValidSubscription' => true,
- ]),
- ];
+ ]);
- $expected = new TemplateResponse('updatenotification', 'admin', $params, '');
+ $expected = new TemplateResponse('updatenotification', 'admin', [], '');
$this->assertEquals($expected, $this->admin->getForm());
}
diff --git a/apps/user_status/appinfo/info.xml b/apps/user_status/appinfo/info.xml
index c385886e946..23f07eb325a 100644
--- a/apps/user_status/appinfo/info.xml
+++ b/apps/user_status/appinfo/info.xml
@@ -9,7 +9,6 @@
<licence>agpl</licence>
<author mail="oc.list@georgehrke.com" >Georg Ehrke</author>
<namespace>UserStatus</namespace>
- <default_enable/>
<category>social</category>
<bugs>https://github.com/nextcloud/server</bugs>
<navigations>
diff --git a/apps/weather_status/appinfo/info.xml b/apps/weather_status/appinfo/info.xml
index 50d107855fd..403d5eb3e5d 100644
--- a/apps/weather_status/appinfo/info.xml
+++ b/apps/weather_status/appinfo/info.xml
@@ -11,7 +11,6 @@
<licence>agpl</licence>
<author mail="eneiluj@posteo.net">Julien Veyssier</author>
<namespace>WeatherStatus</namespace>
- <default_enable/>
<category>integration</category>
<category>dashboard</category>
<bugs>https://github.com/nextcloud/server</bugs>