Skip to content

adjust tests to changes in DirectController in NC>=24 #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kiranparajuli589 merged 1 commit into from
Aug 5, 2022
Merged

adjust tests to changes in DirectController in NC>=24 #192

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 29 additions & 10 deletions tests/lib/Service/DirectDownloadServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@

namespace OCA\OpenProject\Service;

use OC_Util;
use OCA\DAV\Controller\DirectController;
use OCA\DAV\Db\DirectMapper;
use OCA\OpenProject\AppInfo\Application;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\IRootFolder;
use OCP\IRequest;
use OCP\IURLGenerator;
Expand Down Expand Up @@ -62,16 +64,33 @@ protected function setUp(): void {
$root = $c->get(IRootFolder::class);
$this->userFolder = $root->getUserFolder(self::USER_ID);

$this->directController = new DirectController(
'dav',
$c->get(IRequest::class),
$root,
self::USER_ID,
$c->get(DirectMapper::class),
$c->get(ISecureRandom::class),
$c->get(ITimeFactory::class),
$c->get(IURLGenerator::class)
);
// DirectController constructor changed from NC version 24, see https://github.com/nextcloud/server/pull/32482
if (version_compare(OC_Util::getVersionString(), '24') >= 0) {
// @phpstan-ignore-next-line
$this->directController = new DirectController(
'dav',
$c->get(IRequest::class),
$root,
self::USER_ID,
$c->get(DirectMapper::class),
$c->get(ISecureRandom::class),
$c->get(ITimeFactory::class),
$c->get(IURLGenerator::class),
$c->get(IEventDispatcher::class)
);
} else {
// @phpstan-ignore-next-line
$this->directController = new DirectController(
'dav',
$c->get(IRequest::class),
$root,
self::USER_ID,
$c->get(DirectMapper::class),
$c->get(ISecureRandom::class),
$c->get(ITimeFactory::class),
$c->get(IURLGenerator::class)
);
}
}

public static function tearDownAfterClass(): void {
Expand Down