From f3b0e582b99e53a8858d97901c55f08abb060973 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Fri, 10 Dec 2021 15:04:12 +0100
Subject: [PATCH] tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
---
lib/Listener.php | 4 ++--
tests/CoreEventsTest.php | 4 ++--
tests/ListenerTest.php | 6 ++++++
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/lib/Listener.php b/lib/Listener.php
index 6adc075..32ba899 100644
--- a/lib/Listener.php
+++ b/lib/Listener.php
@@ -50,13 +50,13 @@ class Listener implements IConsumer, IApp, INotifier, IDismissableNotifier {
// ignore files in home storage but outside home directory (trashbin, versions, etc)
if (
$event->getStorage()->instanceOfStorage(IHomeStorage::class) && !(
- $event->getPath() === 'files' || str_starts_with($event->getPath(), "files/")
+ $event->getPath() === 'files' || strpos($event->getPath(), "files/") === 0
)
) {
return;
}
// ignore appdata
- if (str_starts_with($event->getPath(), 'appdata_')) {
+ if (strpos($event->getPath(), 'appdata_') === 0) {
return;
}
$this->queue->push('notify_storage_update', [
diff --git a/tests/CoreEventsTest.php b/tests/CoreEventsTest.php
index 5809210..c9378c7 100644
--- a/tests/CoreEventsTest.php
+++ b/tests/CoreEventsTest.php
@@ -67,8 +67,8 @@ class CoreEventsTest extends TestCase {
$storage->getUpdater()->update('foobar');
// file ids are unstable, so we remove them
- foreach ($events as $event) {
- unset($event['fileid']);
+ foreach ($events['notify_storage_update'] as &$event) {
+ unset($event['file_id']);
}
$this->assertEquals([
diff --git a/tests/ListenerTest.php b/tests/ListenerTest.php
index 2c42d03..3557587 100644
--- a/tests/ListenerTest.php
+++ b/tests/ListenerTest.php
@@ -58,6 +58,12 @@ class ListenerTest extends TestCase {
12,
1
));
+
+ // file ids are unstable, so we remove them
+ foreach ($events['notify_storage_update'] as &$event) {
+ unset($event['file_id']);
+ }
+
$this->assertEquals([
'notify_storage_update' => [
['storage' => 1, 'path' => 'foobar'],
--
GitLab