diff options
| -rw-r--r-- | apps/profile/appinfo/info.xml | 6 | ||||
| -rw-r--r-- | build/integration/features/provisioning-v1.feature | 1 | ||||
| -rw-r--r-- | core/shipped.json | 7 | ||||
| -rw-r--r-- | tests/lib/App/AppManagerTest.php | 5 | ||||
| -rw-r--r-- | tests/lib/AppTest.php | 9 |
5 files changed, 20 insertions, 8 deletions
diff --git a/apps/profile/appinfo/info.xml b/apps/profile/appinfo/info.xml index 6a192119285..293350a768e 100644 --- a/apps/profile/appinfo/info.xml +++ b/apps/profile/appinfo/info.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - - SPDX-FileCopyrightText: 2018-2024 Nextcloud GmbH and Nextcloud contributors - - SPDX-License-Identifier: AGPL-3.0-only + - SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors + - SPDX-License-Identifier: AGPL-3.0-or-later --> <info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd"> @@ -11,7 +11,7 @@ <description>Provides a customisable user profile interface.</description> <version>1.0.0</version> <licence>agpl</licence> - <author>Chris Ng</author> + <author>Nextcloud GmbH</author> <namespace>Profile</namespace> <category>social</category> <bugs>https://github.com/nextcloud/server/issues</bugs> diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature index 9e281fbd955..12498bedd7f 100644 --- a/build/integration/features/provisioning-v1.feature +++ b/build/integration/features/provisioning-v1.feature @@ -599,6 +599,7 @@ Feature: provisioning | files_trashbin | | files_versions | | lookup_server_connector | + | profile | | provisioning_api | | settings | | sharebymail | diff --git a/core/shipped.json b/core/shipped.json index 3583ce68546..79a88cf22f0 100644 --- a/core/shipped.json +++ b/core/shipped.json @@ -34,8 +34,8 @@ "provisioning_api", "recommendations", "related_resources", - "settings", "serverinfo", + "settings", "sharebymail", "support", "survey_client", @@ -99,13 +99,14 @@ "webhook_listeners" ], "alwaysEnabled": [ - "files", "cloud_federation_api", "dav", "federatedfilesharing", + "files", "lookup_server_connector", - "provisioning_api", "oauth2", + "profile", + "provisioning_api", "settings", "theming", "twofactor_backupcodes", diff --git a/tests/lib/App/AppManagerTest.php b/tests/lib/App/AppManagerTest.php index 266a60bf159..8169c25c160 100644 --- a/tests/lib/App/AppManagerTest.php +++ b/tests/lib/App/AppManagerTest.php @@ -542,6 +542,7 @@ class AppManagerTest extends TestCase { 'files', 'lookup_server_connector', 'oauth2', + 'profile', 'provisioning_api', 'settings', 'test1', @@ -572,6 +573,7 @@ class AppManagerTest extends TestCase { 'files', 'lookup_server_connector', 'oauth2', + 'profile', 'provisioning_api', 'settings', 'test1', @@ -603,6 +605,7 @@ class AppManagerTest extends TestCase { 'dav' => ['id' => 'dav'], 'files' => ['id' => 'files'], 'federatedfilesharing' => ['id' => 'federatedfilesharing'], + 'profile' => ['id' => 'profile'], 'provisioning_api' => ['id' => 'provisioning_api'], 'lookup_server_connector' => ['id' => 'lookup_server_connector'], 'test1' => ['id' => 'test1', 'version' => '1.0.1', 'requiremax' => '9.0.0'], @@ -661,6 +664,7 @@ class AppManagerTest extends TestCase { 'dav' => ['id' => 'dav'], 'files' => ['id' => 'files'], 'federatedfilesharing' => ['id' => 'federatedfilesharing'], + 'profile' => ['id' => 'profile'], 'provisioning_api' => ['id' => 'provisioning_api'], 'lookup_server_connector' => ['id' => 'lookup_server_connector'], 'test1' => ['id' => 'test1', 'version' => '1.0.1', 'requiremax' => '8.0.0'], @@ -711,6 +715,7 @@ class AppManagerTest extends TestCase { 'files', 'lookup_server_connector', 'oauth2', + 'profile', 'provisioning_api', 'settings', 'test1', diff --git a/tests/lib/AppTest.php b/tests/lib/AppTest.php index 41643b49ddc..98c3a6ff158 100644 --- a/tests/lib/AppTest.php +++ b/tests/lib/AppTest.php @@ -345,6 +345,7 @@ class AppTest extends \Test\TestCase { 'federatedfilesharing', 'lookup_server_connector', 'oauth2', + 'profile', 'provisioning_api', 'settings', 'theming', @@ -368,6 +369,7 @@ class AppTest extends \Test\TestCase { 'federatedfilesharing', 'lookup_server_connector', 'oauth2', + 'profile', 'provisioning_api', 'settings', 'theming', @@ -392,6 +394,7 @@ class AppTest extends \Test\TestCase { 'federatedfilesharing', 'lookup_server_connector', 'oauth2', + 'profile', 'provisioning_api', 'settings', 'theming', @@ -416,6 +419,7 @@ class AppTest extends \Test\TestCase { 'federatedfilesharing', 'lookup_server_connector', 'oauth2', + 'profile', 'provisioning_api', 'settings', 'theming', @@ -440,6 +444,7 @@ class AppTest extends \Test\TestCase { 'federatedfilesharing', 'lookup_server_connector', 'oauth2', + 'profile', 'provisioning_api', 'settings', 'theming', @@ -523,11 +528,11 @@ class AppTest extends \Test\TestCase { ); $apps = \OC_App::getEnabledApps(); - $this->assertEquals(['files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'settings', 'theming', 'twofactor_backupcodes', 'viewer', 'workflowengine'], $apps); + $this->assertEquals(['files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'profile', 'provisioning_api', 'settings', 'theming', 'twofactor_backupcodes', 'viewer', 'workflowengine'], $apps); // mock should not be called again here $apps = \OC_App::getEnabledApps(); - $this->assertEquals(['files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'provisioning_api', 'settings', 'theming', 'twofactor_backupcodes', 'viewer', 'workflowengine'], $apps); + $this->assertEquals(['files', 'app3', 'cloud_federation_api', 'dav', 'federatedfilesharing', 'lookup_server_connector', 'oauth2', 'profile', 'provisioning_api', 'settings', 'theming', 'twofactor_backupcodes', 'viewer', 'workflowengine'], $apps); $this->restoreAppConfig(); \OC_User::setUserId(null); |