From e906f9f9b526cc5671d526ce56392d2e72e1bc75 Mon Sep 17 00:00:00 2001 From: Niraj Acharya Date: Tue, 8 Oct 2024 14:46:33 +0545 Subject: [PATCH] refactoring test code --- tests/acceptance/TestHelpers/WebDavHelper.php | 2 +- tests/acceptance/bootstrap/FilesVersionsContext.php | 8 ++++---- tests/acceptance/bootstrap/TrashbinContext.php | 2 +- tests/acceptance/bootstrap/WebDav.php | 10 +++++----- tests/acceptance/bootstrap/WebDavPropertiesContext.php | 3 ++- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/tests/acceptance/TestHelpers/WebDavHelper.php b/tests/acceptance/TestHelpers/WebDavHelper.php index ef03bbf667..6f182cad92 100644 --- a/tests/acceptance/TestHelpers/WebDavHelper.php +++ b/tests/acceptance/TestHelpers/WebDavHelper.php @@ -921,7 +921,7 @@ class WebDavHelper { ['d:getlastmodified'], $xRequestId, '1', - '', + null, null, $davVersionToUse ); diff --git a/tests/acceptance/bootstrap/FilesVersionsContext.php b/tests/acceptance/bootstrap/FilesVersionsContext.php index c9c7a6afb6..8c738c9cb3 100644 --- a/tests/acceptance/bootstrap/FilesVersionsContext.php +++ b/tests/acceptance/bootstrap/FilesVersionsContext.php @@ -90,7 +90,7 @@ class FilesVersionsContext implements Context { $endpoint, null, null, - '', + null, "versions", (string)$this->featureContext->getDavPathVersion(), false, @@ -148,7 +148,7 @@ class FilesVersionsContext implements Context { $endpoint, null, null, - '', + null, "versions", (string)$this->featureContext->getDavPathVersion() ) @@ -192,7 +192,7 @@ class FilesVersionsContext implements Context { $this->getVersionsPathForFileId($fileId), null, $body, - '', + null, null, '2' ); @@ -551,7 +551,7 @@ class FilesVersionsContext implements Context { $properties, $this->featureContext->getStepLineRef(), (string) $folderDepth, - '', + null, "versions" ); return $response; diff --git a/tests/acceptance/bootstrap/TrashbinContext.php b/tests/acceptance/bootstrap/TrashbinContext.php index 41c6b4e84d..1f560d2c45 100644 --- a/tests/acceptance/bootstrap/TrashbinContext.php +++ b/tests/acceptance/bootstrap/TrashbinContext.php @@ -868,7 +868,7 @@ class TrashbinContext implements Context { $trashItemHRef, [], null, - '', + null, 'trash-bin' ); $this->featureContext->setResponse($response); diff --git a/tests/acceptance/bootstrap/WebDav.php b/tests/acceptance/bootstrap/WebDav.php index 0ada9ba2d5..4af50af567 100644 --- a/tests/acceptance/bootstrap/WebDav.php +++ b/tests/acceptance/bootstrap/WebDav.php @@ -3245,7 +3245,7 @@ trait WebDav { $destination, [], null, - '', + null, "uploads", null, false, @@ -3280,7 +3280,7 @@ trait WebDav { $destination, [], $data, - '', + null, "uploads", null, false, @@ -3446,7 +3446,7 @@ trait WebDav { $source, $headers, null, - '', + null, "uploads", null, false, @@ -3474,7 +3474,7 @@ trait WebDav { $source, $headers, null, - '', + null, "uploads" ); } @@ -3873,7 +3873,7 @@ trait WebDav { if ($this->getDavPathVersion() === 3) { $this->setResponse($this->uploadToSharedFolder($user, $destination, $content)); } else { - $this->setResponse($this->uploadFileWithContent($user, $content, $destination, '')); + $this->setResponse($this->uploadFileWithContent($user, $content, $destination, null)); } } diff --git a/tests/acceptance/bootstrap/WebDavPropertiesContext.php b/tests/acceptance/bootstrap/WebDavPropertiesContext.php index 529bfdcf8e..bb82b6120e 100644 --- a/tests/acceptance/bootstrap/WebDavPropertiesContext.php +++ b/tests/acceptance/bootstrap/WebDavPropertiesContext.php @@ -245,6 +245,7 @@ class WebDavPropertiesContext implements Context { $properties, $this->featureContext->getStepLineRef(), "0", + null, "files", $this->featureContext->getDavPathVersion() ); @@ -269,7 +270,7 @@ class WebDavPropertiesContext implements Context { $path, '0', $properties, - '', + null, $this->featureContext->getDavPathVersion() === 1 ? "public-files" : "public-files-new" ); }