-
{{ t('deck', 'This week') }}
-
+
{{ t('deck', 'Next 7 days') }}
+
@@ -160,7 +160,7 @@ export default {
overdue: [],
today: [],
tomorrow: [],
- thisWeek: [],
+ nextSevenDays: [],
later: [],
}
dataset.forEach(card => {
@@ -180,7 +180,7 @@ export default {
all.tomorrow.push(card)
}
if (hours >= (48 - currentHour) && hours < (24 * 7)) {
- all.thisWeek.push(card)
+ all.nextSevenDays.push(card)
}
if (hours >= (24 * 7)) {
all.later.push(card)
diff --git a/src/init-calendar.js b/src/init-calendar.js
index 375524fe5..51cc96c82 100644
--- a/src/init-calendar.js
+++ b/src/init-calendar.js
@@ -26,8 +26,8 @@ import { generateUrl } from '@nextcloud/router'
subscribe('calendar:handle-todo-click', ({ calendarId, taskId }) => {
const deckAppPrefix = 'app-generated--deck--board-'
if (calendarId.startsWith(deckAppPrefix)) {
- const board = calendarId.substr(deckAppPrefix.length)
- const card = taskId.substr('card-'.length).replace('.ics', '')
+ const board = calendarId.slice(deckAppPrefix.length)
+ const card = taskId.slice('card-'.length).replace('.ics', '')
console.debug('[deck] Clicked task matches deck calendar pattern')
window.location = generateUrl(`apps/deck/#/board/${board}/card/${card}`)
}
diff --git a/src/init-talk.js b/src/init-talk.js
index 3720d092d..8f325f525 100644
--- a/src/init-talk.js
+++ b/src/init-talk.js
@@ -46,7 +46,7 @@ window.addEventListener('DOMContentLoaded', () => {
icon: 'icon-deck',
async callback({ message: { message, actorDisplayName }, metadata: { name: conversationName, token: conversationToken } }) {
const shortenedMessageCandidate = message.replace(/^(.{255}[^\s]*).*/, '$1')
- const shortenedMessage = shortenedMessageCandidate === '' ? message.substr(0, 255) : shortenedMessageCandidate
+ const shortenedMessage = shortenedMessageCandidate === '' ? message.slice(0, 255) : shortenedMessageCandidate
try {
await buildSelector(CardCreateDialog, {
props: {
diff --git a/src/store/card.js b/src/store/card.js
index 30c54b52d..0aaccca58 100644
--- a/src/store/card.js
+++ b/src/store/card.js
@@ -92,7 +92,7 @@ export default {
const filterOutQuotes = (q) => {
if (q[0] === '"' && q[q.length - 1] === '"') {
- return q.substr(1, q.length - 2)
+ return q.slice(1, -1)
}
return q
}
@@ -153,7 +153,7 @@ export default {
const comparator = query[0] + (query[1] === '=' ? '=' : '')
const isValidComparator = ['<', '<=', '>', '>='].indexOf(comparator) !== -1
const parsedCardDate = moment(card.duedate)
- const parsedDate = moment(query.substr(isValidComparator ? comparator.length : 0))
+ const parsedDate = moment(query.slice(isValidComparator ? comparator.length : 0))
switch (comparator) {
case '<':
hasMatch = hasMatch && parsedCardDate.isBefore(parsedDate)
diff --git a/src/store/main.js b/src/store/main.js
index f7c3a16ee..9c65509bc 100644
--- a/src/store/main.js
+++ b/src/store/main.js
@@ -486,9 +486,8 @@ export default new Vuex.Store({
dispatch('loadBoardById', acl.boardId)
})
},
- async transferOwnership({ commit }, { boardId, owner, newOwner }) {
+ async transferOwnership({ commit }, { boardId, newOwner }) {
await axios.put(generateUrl(`apps/deck/boards/${boardId}/transferOwner`), {
- owner,
newOwner,
})
},
diff --git a/tests/integration/composer.json b/tests/integration/composer.json
index 2f8d1b789..5d7f3a4b8 100644
--- a/tests/integration/composer.json
+++ b/tests/integration/composer.json
@@ -1,11 +1,11 @@
{
"require-dev": {
- "phpunit/phpunit": "~6.5",
- "behat/behat": "~3.8.0",
- "guzzlehttp/guzzle": "6.5.2",
+ "phpunit/phpunit": "~9",
+ "behat/behat": "~3.10.0",
+ "guzzlehttp/guzzle": "7.4.2",
"jarnaiz/behat-junit-formatter": "^1.3",
- "sabre/dav": "3.2.3",
- "symfony/event-dispatcher": "~4.4"
+ "sabre/dav": "4.3.1",
+ "symfony/event-dispatcher": "~5.4"
},
"autoload": {
"psr-0": {
diff --git a/tests/phpunit.integration.xml b/tests/phpunit.integration.xml
index 45d0b5081..f62881f9a 100644
--- a/tests/phpunit.integration.xml
+++ b/tests/phpunit.integration.xml
@@ -1,15 +1,16 @@
-
-
-
- ./integration/database
-
-
- ./integration/app
-
-
-
-
- ./../lib
-
-
+
+
+
+
+ ./../lib
+
+
+
+
+ ./integration/database
+
+
+ ./integration/app
+
+
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 4bb7dc40d..af2ea49bd 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -1,12 +1,13 @@
-
-
-
- ./unit
-
-
-
-
- ./../lib
-
-
+
+
+
+
+ ./../lib
+
+
+
+
+ ./unit
+
+
diff --git a/tests/unit/Activity/ActivityManagerTest.php b/tests/unit/Activity/ActivityManagerTest.php
index 8727820b9..700d72b19 100644
--- a/tests/unit/Activity/ActivityManagerTest.php
+++ b/tests/unit/Activity/ActivityManagerTest.php
@@ -103,15 +103,13 @@ class ActivityManagerTest extends TestCase {
if ($format !== '') {
$this->assertStringContainsString('{user}', $format);
} else {
- /** @noinspection ForgottenDebugOutputInspection */
- print_r('No activity string found for '. $constant . PHP_EOL);
+ self::addWarning('No activity string found for '. $constant);
}
$format = $this->activityManager->getActivityFormat('cz', $value, [], true);
if ($format !== '') {
$this->assertStringStartsWith('You', $format);
} else {
- /** @noinspection ForgottenDebugOutputInspection */
- print_r('No own activity string found for '. $constant . PHP_EOL);
+ self::addWarning('No own activity string found for '. $constant);
}
}
}
diff --git a/tests/unit/Cron/DeleteCronTest.php b/tests/unit/Cron/DeleteCronTest.php
index e411a5d31..94e390e5c 100644
--- a/tests/unit/Cron/DeleteCronTest.php
+++ b/tests/unit/Cron/DeleteCronTest.php
@@ -30,24 +30,30 @@ use OCA\Deck\Db\BoardMapper;
use OCA\Deck\InvalidAttachmentType;
use OCA\Deck\Service\AttachmentService;
use OCA\Deck\Service\IAttachmentService;
+use OCP\AppFramework\Utility\ITimeFactory;
+use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
-class DeleteCronTest extends \Test\TestCase {
+class DeleteCronTest extends TestCase {
- /** @var BoardMapper|\PHPUnit\Framework\MockObject\MockObject */
+ /** @var ITimeFactory|MockObject */
+ private $timeFactory;
+ /** @var BoardMapper|MockObject */
protected $boardMapper;
- /** @var AttachmentService|\PHPUnit\Framework\MockObject\MockObject */
+ /** @var AttachmentService|MockObject */
private $attachmentService;
- /** @var AttachmentMapper|\PHPUnit\Framework\MockObject\MockObject */
+ /** @var AttachmentMapper|MockObject */
private $attachmentMapper;
/** @var DeleteCron */
protected $deleteCron;
public function setUp(): void {
parent::setUp();
+ $this->timeFactory = $this->createMock(ITimeFactory::class);
$this->boardMapper = $this->createMock(BoardMapper::class);
$this->attachmentService = $this->createMock(AttachmentService::class);
$this->attachmentMapper = $this->createMock(AttachmentMapper::class);
- $this->deleteCron = new DeleteCron($this->boardMapper, $this->attachmentService, $this->attachmentMapper);
+ $this->deleteCron = new DeleteCron($this->timeFactory, $this->boardMapper, $this->attachmentService, $this->attachmentMapper);
}
protected function getBoard($id) {
diff --git a/tests/unit/Cron/ScheduledNoificationsTest.php b/tests/unit/Cron/ScheduledNoificationsTest.php
index f44b91fa1..6e3d6bd1f 100644
--- a/tests/unit/Cron/ScheduledNoificationsTest.php
+++ b/tests/unit/Cron/ScheduledNoificationsTest.php
@@ -26,28 +26,34 @@ namespace OCA\Deck\Cron;
use OCA\Deck\Db\Card;
use OCA\Deck\Db\CardMapper;
use OCA\Deck\Notification\NotificationHelper;
+use OCP\AppFramework\Utility\ITimeFactory;
use OCP\ILogger;
+use PHPUnit\Framework\MockObject\MockObject;
+use Test\TestCase;
-class ScheduledNoificationsTest extends \Test\TestCase {
+class ScheduledNoificationsTest extends TestCase {
- /** @var CardMapper|\PHPUnit\Framework\MockObject\MockObject */
+ /** @var ITimeFactory|MockObject */
+ protected $timeFactory;
+ /** @var CardMapper|MockObject */
protected $cardMapper;
- /** @var NotificationHelper|\PHPUnit\Framework\MockObject\MockObject */
+ /** @var NotificationHelper|MockObject */
protected $notificationHelper;
- /** @var ILogger|\PHPUnit\Framework\MockObject\MockObject */
+ /** @var ILogger|MockObject */
protected $logger;
/** @var ScheduledNotifications */
protected $scheduledNotifications;
public function setUp(): void {
parent::setUp();
+ $this->timeFactory = $this->createMock(ITimeFactory::class);
$this->cardMapper = $this->createMock(CardMapper::class);
$this->notificationHelper = $this->createMock(NotificationHelper::class);
$this->logger = $this->createMock(ILogger::class);
- $this->scheduledNotifications = new ScheduledNotifications($this->cardMapper, $this->notificationHelper, $this->logger);
+ $this->scheduledNotifications = new ScheduledNotifications($this->timeFactory, $this->cardMapper, $this->notificationHelper, $this->logger);
}
- public function testDeleteCron() {
+ public function testScheduledCron() {
$c1 = new Card();
$c2 = new Card();
$cards = [$c1, $c2];
diff --git a/tests/unit/Service/StackServiceTest.php b/tests/unit/Service/StackServiceTest.php
index 79e04eca3..913a74f69 100644
--- a/tests/unit/Service/StackServiceTest.php
+++ b/tests/unit/Service/StackServiceTest.php
@@ -195,7 +195,7 @@ class StackServiceTest extends TestCase {
}
public function testUpdate() {
- $this->permissionService->expects($this->once())->method('checkPermission');
+ $this->permissionService->expects($this->exactly(2))->method('checkPermission');
$stack = new Stack();
$this->stackMapper->expects($this->once())->method('find')->willReturn($stack);
$this->stackMapper->expects($this->once())->method('update')->willReturn($stack);