Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/calendar.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAnna Larch <anna@nextcloud.com>2021-12-01 18:16:24 +0300
committerAnna Larch <anna@nextcloud.com>2021-12-02 17:15:51 +0300
commit82acd3afd180c043c3e3ac65f92d8f3d1ab2dc96 (patch)
treeb2cba938a6e37275c4414cc1ea25b867b160a952 /tests
parent76ef501633d259d3ad567f2aad3cd8f4d40206e4 (diff)
Check for TRANSP and CANCELLED property when conflict checking
Signed-off-by: Anna Larch <anna@nextcloud.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/php/unit/Service/Appointments/EventConflictFilterTest.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/php/unit/Service/Appointments/EventConflictFilterTest.php b/tests/php/unit/Service/Appointments/EventConflictFilterTest.php
index 1d55335c..785b052c 100644
--- a/tests/php/unit/Service/Appointments/EventConflictFilterTest.php
+++ b/tests/php/unit/Service/Appointments/EventConflictFilterTest.php
@@ -32,6 +32,7 @@ use OCA\Calendar\Service\Appointments\Interval;
use OCP\Calendar\ICalendarQuery;
use OCP\Calendar\IManager;
use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
class EventConflictFilterTest extends TestCase {
@@ -41,6 +42,9 @@ class EventConflictFilterTest extends TestCase {
/** @var EventConflictFilter */
private $filter;
+ /** @var mixed|MockObject|LoggerInterface */
+ private $logger;
+
protected function setUp(): void {
parent::setUp();
@@ -49,9 +53,11 @@ class EventConflictFilterTest extends TestCase {
}
$this->calendarManager = $this->createMock(IManager::class);
+ $this->logger = $this->createMock(LoggerInterface::class);
$this->filter = new EventConflictFilter(
$this->calendarManager,
+ $this->logger
);
}
@@ -89,7 +95,7 @@ class EventConflictFilterTest extends TestCase {
->method('searchForPrincipal')
->with($query)
->willReturn([
- ['UID' => 'abc'],
+ ['uid' => 'abc'],
]);
$filtered = $this->filter->filter($config, $slots);