Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
php-versions: [8.2, 8.3, 8.4]
nextcloud-versions: ['stable31']
nextcloud-versions: ['stable31', 'stable32']
name: Nextcloud ${{ matrix.nextcloud-versions }} php${{ matrix.php-versions }} unit tests
steps:
- name: Set up php${{ matrix.php-versions }}
Expand Down Expand Up @@ -41,6 +41,9 @@ jobs:
- name: Enable maps app
working-directory: nextcloud
run: php -f occ app:enable maps
- name: Enable files_external app
working-directory: nextcloud
run: php -f occ app:enable files_external
- name: Run tests
if: ${{ always() && matrix.php-versions != 8.1 }}
working-directory: nextcloud/apps/maps
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependencies>
<php min-version="8.1" max-version="8.4"/>
<lib>exif</lib>
<nextcloud min-version="30" max-version="31"/>
<nextcloud min-version="30" max-version="32"/>
</dependencies>
<repair-steps>
<post-migration>
Expand Down
6 changes: 3 additions & 3 deletions tests/Unit/Controller/ContactsControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ protected function setUp(): void {
//$this->userPrincipalBackend = new Principal(
// $c->getServer()->getUserManager(),
// $c->getServer()->getGroupManager(),
// $c->getServer()->getShareManager(),
// $c->getServer()->get(\OCP\Share\IManager::class),
// \OC::$server->getUserSession(),
// $c->query(IServerContainer::class)->getConfig(),
// \OC::$server->getAppManager()
Expand All @@ -130,7 +130,7 @@ protected function setUp(): void {
$this->addressService,
'test',
$this->cdBackend,
$c->query(IServerContainer::class)->getAvatarManager(),
$c->query(IServerContainer::class)->get(\OCP\IAvatarManager::class),
$this->root,
$urlGenerator);
//$this->contactsController = $this->getMockBuilder('OCA\Maps\Controller\ContactsController')
Expand All @@ -145,7 +145,7 @@ protected function setUp(): void {
$this->addressService,
'test2',
$this->cdBackend,
$c->query(IServerContainer::class)->getAvatarManager(),
$c->query(IServerContainer::class)->get(\OCP\IAvatarManager::class),
$this->root,
$urlGenerator
);
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/Controller/DevicesApiControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ protected function setUp(): void {
$this->request,
$c->query(IServerContainer::class),
$c->query(IServerContainer::class)->getConfig(),
$c->getServer()->getShareManager(),
$c->getServer()->get(\OCP\Share\IManager::class),
$c->getServer()->getAppManager(),
$c->getServer()->getUserManager(),
$c->getServer()->getGroupManager(),
Expand All @@ -97,7 +97,7 @@ protected function setUp(): void {
$this->request,
$c->query(IServerContainer::class),
$c->query(IServerContainer::class)->getConfig(),
$c->getServer()->getShareManager(),
$c->getServer()->get(\OCP\Share\IManager::class),
$c->getServer()->getAppManager(),
$c->getServer()->getUserManager(),
$c->getServer()->getGroupManager(),
Expand Down
8 changes: 4 additions & 4 deletions tests/Unit/Controller/DevicesControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ protected function setUp(): void {
$this->request,
$c->query(IServerContainer::class),
$c->query(IServerContainer::class)->getConfig(),
$c->getServer()->getShareManager(),
$c->getServer()->get(\OCP\Share\IManager::class),
$c->getServer()->getAppManager(),
$c->getServer()->getUserManager(),
$c->getServer()->getGroupManager(),
$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
$c->query(DevicesService::class),
$c->query(DeviceShareMapper::class),
$c->query(IServerContainer::class)->getDateTimeZone(),
$c->query(IServerContainer::class)->get(\OCP\IDateTimeZone::class),
$c->query(IRootFolder::class),
'test'
);
Expand All @@ -102,14 +102,14 @@ protected function setUp(): void {
$this->request,
$c->query(IServerContainer::class),
$c->query(IServerContainer::class)->getConfig(),
$c->getServer()->getShareManager(),
$c->getServer()->get(\OCP\Share\IManager::class),
$c->getServer()->getAppManager(),
$c->getServer()->getUserManager(),
$c->getServer()->getGroupManager(),
$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
$c->query(DevicesService::class),
$c->query(DeviceShareMapper::class),
$c->query(IServerContainer::class)->getDateTimeZone(),
$c->query(IServerContainer::class)->get(\OCP\IDateTimeZone::class),
$c->query(IRootFolder::class),
'test2'
);
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/Controller/FavoritesApiControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ protected function setUp(): void {
$this->request,
$c->query(IServerContainer::class),
$c->query(IServerContainer::class)->getConfig(),
$c->getServer()->getShareManager(),
$c->getServer()->get(\OCP\Share\IManager::class),
$c->getServer()->getAppManager(),
$c->getServer()->getUserManager(),
$c->getServer()->getGroupManager(),
Expand All @@ -97,7 +97,7 @@ protected function setUp(): void {
$this->request,
$c->query(IServerContainer::class),
$c->query(IServerContainer::class)->getConfig(),
$c->getServer()->getShareManager(),
$c->getServer()->get(\OCP\Share\IManager::class),
$c->getServer()->getAppManager(),
$c->getServer()->getUserManager(),
$c->getServer()->getGroupManager(),
Expand Down
8 changes: 4 additions & 4 deletions tests/Unit/Controller/FavoritesControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ protected function setUp(): void {
$this->request,
$c->query(IServerContainer::class),
$c->query(IServerContainer::class)->getConfig(),
$c->getServer()->getShareManager(),
$c->getServer()->get(\OCP\Share\IManager::class),
$c->getServer()->getAppManager(),
$c->getServer()->getUserManager(),
$c->getServer()->getGroupManager(),
$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
$c->query(FavoritesService::class),
$c->query(IServerContainer::class)->getDateTimeZone(),
$c->query(IServerContainer::class)->get(\OCP\IDateTimeZone::class),
$c->query(FavoriteShareMapper::class),
'test'
);
Expand All @@ -109,13 +109,13 @@ protected function setUp(): void {
$this->request,
$c->query(IServerContainer::class),
$c->query(IServerContainer::class)->getConfig(),
$c->getServer()->getShareManager(),
$c->getServer()->get(\OCP\Share\IManager::class),
$c->getServer()->getAppManager(),
$c->getServer()->getUserManager(),
$c->getServer()->getGroupManager(),
$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
$c->query(FavoritesService::class),
$c->query(IServerContainer::class)->getDateTimeZone(),
$c->query(IServerContainer::class)->get(\OCP\IDateTimeZone::class),
$c->query(FavoriteShareMapper::class),
'test2'
);
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Controller/PhotosControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ protected function setUp(): void {
$this->rootFolder,
$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
$c->query(GeophotoMapper::class),
$c->query(IServerContainer::class)->getShareManager(),
$c->query(IServerContainer::class)->get(\OCP\Share\IManager::class),
$c->query(\OCP\BackgroundJob\IJobList::class)
);

Expand Down
6 changes: 3 additions & 3 deletions tests/Unit/Controller/TracksControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ protected function setUp(): void {
$c->query(IServerContainer::class)->get(\Psr\Log\LoggerInterface::class),
$c->query(IServerContainer::class)->getL10N($c->query('AppName')),
$this->rootFolder,
$c->query(IServerContainer::class)->getShareManager(),
$c->query(IServerContainer::class)->get(\OCP\Share\IManager::class),
$c->query(IServerContainer::class)->query(\OCP\IDBConnection::class)
);

Expand All @@ -94,7 +94,7 @@ protected function setUp(): void {
$this->request,
$c->query(IServerContainer::class),
$c->query(IServerContainer::class)->getConfig(),
$c->query(IServerContainer::class)->getShareManager(),
$c->query(IServerContainer::class)->get(\OCP\Share\IManager::class),
$c->getServer()->getAppManager(),
$c->getServer()->getUserManager(),
$c->getServer()->getGroupManager(),
Expand All @@ -108,7 +108,7 @@ protected function setUp(): void {
$this->request,
$c->query(IServerContainer::class),
$c->query(IServerContainer::class)->getConfig(),
$c->query(IServerContainer::class)->getShareManager(),
$c->query(IServerContainer::class)->get(\OCP\Share\IManager::class),
$c->getServer()->getAppManager(),
$c->getServer()->getUserManager(),
$c->getServer()->getGroupManager(),
Expand Down
Loading