From 3ef2ca368a3e101b69e58ea721f70c6bfea0aebb Mon Sep 17 00:00:00 2001 From: nabim777 Date: Mon, 30 Dec 2024 17:07:34 +0545 Subject: [PATCH] remove the test for the tus-upload Signed-off-by: nabim777 --- .../acceptance/bootstrap/SpacesTUSContext.php | 19 -------- tests/acceptance/bootstrap/TUSContext.php | 37 --------------- .../expected-failures-without-remotephp.md | 3 -- .../features/apiSpaces/uploadSpaces.feature | 3 ++ .../apiSpacesShares/shareUploadTUS.feature | 47 ------------------- 5 files changed, 3 insertions(+), 106 deletions(-) diff --git a/tests/acceptance/bootstrap/SpacesTUSContext.php b/tests/acceptance/bootstrap/SpacesTUSContext.php index 65e20becda7..a179244d7ef 100644 --- a/tests/acceptance/bootstrap/SpacesTUSContext.php +++ b/tests/acceptance/bootstrap/SpacesTUSContext.php @@ -95,25 +95,6 @@ public function userUploadsAFileViaTusInsideOfTheSpaceUsingTheWebdavApi( $this->featureContext->setLastUploadDeleteTime(\time()); } - /** - * @When the public uploads file :source to :destination via TUS inside last link shared folder with password :password using the WebDAV API - * - * @param string $source - * @param string $destination - * @param string $password - * - * @return void - * @throws Exception - */ - public function thePublicUploadsFileViaTusInsideLastSharedFolderWithPasswordUsingTheWebdavApi( - string $source, - string $destination, - string $password - ): void { - $this->tusContext->publicUploadFileUsingTus($source, $destination, $password); - $this->featureContext->setLastUploadDeleteTime(\time()); - } - /** * @Given user :user has created a new TUS resource in the space :spaceName with the following headers: * diff --git a/tests/acceptance/bootstrap/TUSContext.php b/tests/acceptance/bootstrap/TUSContext.php index 46cf2fc67c7..4d023a0e01c 100644 --- a/tests/acceptance/bootstrap/TUSContext.php +++ b/tests/acceptance/bootstrap/TUSContext.php @@ -344,43 +344,6 @@ public function uploadFileUsingTus( } } - /** - * @param string $source - * @param string $destination - * @param string $password - * - * @return void - */ - public function publicUploadFileUsingTus( - string $source, - string $destination, - string $password, - ): void { - $password = $this->featureContext->getActualPassword($password); - if ($this->featureContext->isUsingSharingNG()) { - $token = $this->featureContext->shareNgGetLastCreatedLinkShareToken(); - } else { - $token = $this->featureContext->getLastCreatedPublicShareToken(); - } - $headers = [ - 'Authorization' => 'Basic ' . \base64_encode("public" . ':' . $password), - ]; - $sourceFile = $this->featureContext->acceptanceTestsDirLocation() . $source; - $url = WebdavHelper::getDavPath(WebDavHelper::DAV_VERSION_SPACES, $token, "public-files"); - - $client = new Client( - $this->featureContext->getBaseUrl(), - [ - 'verify' => false, - 'headers' => $headers - ] - ); - - $client->setApiPath($url); - $client->setKey((string)rand())->file($sourceFile, $destination); - $client->file($sourceFile, $destination)->createWithUpload("", 0); - } - /** * @When user :user uploads file with content :content to :destination using the TUS protocol on the WebDAV API * diff --git a/tests/acceptance/expected-failures-without-remotephp.md b/tests/acceptance/expected-failures-without-remotephp.md index 120d9635765..fc9b50174ac 100644 --- a/tests/acceptance/expected-failures-without-remotephp.md +++ b/tests/acceptance/expected-failures-without-remotephp.md @@ -198,9 +198,6 @@ - [apiSpaces/uploadSpaces.feature:98](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/uploadSpaces.feature#L98) - [apiSpaces/uploadSpaces.feature:114](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/uploadSpaces.feature#L114) - [apiSpaces/uploadSpaces.feature:130](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/uploadSpaces.feature#L130) -- [apiSpacesShares/shareUploadTUS.feature:407](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature#L407) -- [apiSpacesShares/shareUploadTUS.feature:422](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature#L422) -- [apiSpacesShares/shareUploadTUS.feature:439](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature#L439) - [apiSpacesShares/shareSpacesViaLink.feature:61](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesShares/shareSpacesViaLink.feature#L61) - [apiDepthInfinity/propfind.feature:74](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiDepthInfinity/propfind.feature#L74) - [apiDepthInfinity/propfind.feature:124](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiDepthInfinity/propfind.feature#L124) diff --git a/tests/acceptance/features/apiSpaces/uploadSpaces.feature b/tests/acceptance/features/apiSpaces/uploadSpaces.feature index 82bc6ac0ba8..65821a4ef36 100644 --- a/tests/acceptance/features/apiSpaces/uploadSpaces.feature +++ b/tests/acceptance/features/apiSpaces/uploadSpaces.feature @@ -109,6 +109,7 @@ Feature: Upload files into a space | textfile.txt | And for user "Alice" folder "uploadFolder" of the space "Personal" should not contain these files: | textfile (1).txt | + | textfile (2).txt | @issue-10331 @issue-10469 Scenario: public uploads a zero byte file to a public share folder inside project space @@ -125,6 +126,7 @@ Feature: Upload files into a space | textfile.txt | And for user "Alice" folder "uploadFolder" of the space "Project Ceres" should not contain these files: | textfile (1).txt | + | textfile (2).txt | @issue-10331 @issue-10469 Scenario: public uploads a zero byte file to a public share project space @@ -139,3 +141,4 @@ Feature: Upload files into a space | textfile.txt | And for user "Alice" the space "Project Ceres" should not contain these files: | textfile (1).txt | + | textfile (2).txt | diff --git a/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature b/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature index 1df471ddc5b..e17dcc24e83 100644 --- a/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature +++ b/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature @@ -402,50 +402,3 @@ Feature: upload resources on share using TUS protocol | Tus-Resumable | 1.0.0 | Then the HTTP status code should be "460" And for user "Alice" the content of the file "/textFile.txt" of the space "Personal" should be "original content" - - @issue-10331 @issue-10469 - Scenario: public uploads a zero byte file to a public share folder - Given using SharingNG - And user "Alice" has created folder "/uploadFolder" - And user "Alice" has created the following resource link share: - | resource | uploadFolder | - | space | Personal | - | permissionsRole | createOnly | - | password | %public% | - When the public uploads file "filesForUpload/zerobyte.txt" to "textfile.txt" via TUS inside last link shared folder with password "%public%" using the WebDAV API - And for user "Alice" folder "uploadFolder" of the space "Personal" should contain these files: - | textfile.txt | - And for user "Alice" folder "uploadFolder" of the space "Personal" should not contain these files: - | textfile (1).txt | - - @issue-10331 @issue-10469 - Scenario: public uploads a zero-byte file to a shared folder inside project space - Given using SharingNG - And the administrator has assigned the role "Space Admin" to user "Alice" using the Graph API - And user "Alice" has created a space "Project" with the default quota using the Graph API - And user "Alice" has created a folder "/uploadFolder" in space "Project" - And user "Alice" has created the following resource link share: - | resource | uploadFolder | - | space | Project | - | permissionsRole | createOnly | - | password | %public% | - When the public uploads file "filesForUpload/zerobyte.txt" to "textfile.txt" via TUS inside last link shared folder with password "%public%" using the WebDAV API - And for user "Alice" folder "uploadFolder" of the space "Project" should contain these files: - | textfile.txt | - And for user "Alice" folder "uploadFolder" of the space "Project" should not contain these files: - | textfile (1).txt | - - @issue-10331 @issue-10469 - Scenario: public uploads a zero-byte file to a public share project space - Given using SharingNG - And the administrator has assigned the role "Space Admin" to user "Alice" using the Graph API - And user "Alice" has created a space "Project" with the default quota using the Graph API - And user "Alice" has created the following space link share: - | space | Project | - | permissionsRole | createOnly | - | password | %public% | - When the public uploads file "filesForUpload/zerobyte.txt" to "textfile.txt" via TUS inside last link shared folder with password "%public%" using the WebDAV API - Then for user "Alice" the space "Project" should contain these files: - | textfile.txt | - And for user "Alice" the space "Project" should not contain these files: - | textfile (1).txt |