Skip to content

[full-ci][tests-only] Add step for checking the status code and headers in TUS upload #10990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saw-jan merged 4 commits into from
May 15, 2025
Merged

[full-ci][tests-only] Add step for checking the status code and headers in TUS upload #10990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34a9ac6
add step for checking the status code and headers in TUS upload
nabim777 Feb 11, 2025
7b2db9b
add expected failure
nabim777 Feb 13, 2025
b75f5fc
refactor step for tus upload share
nabim777 May 11, 2025
01fae6e
added issues in expected failure file
nabim777 May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions tests/acceptance/bootstrap/SpacesTUSContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,13 @@ public function userUploadsAFileWithContentToViaTusInsideOfTheSpaceUsingTheWebda
string $resource,
string $spaceName
): void {
$isSpacesDavPathVersion = $this->featureContext->getDavPathVersion() === WebDavHelper::DAV_VERSION_SPACES;
$resource = \ltrim($resource, "/");
if (!$isSpacesDavPathVersion && $spaceName === 'Shares' && !\str_starts_with($resource, "Shares/")) {
$resource = 'Shares/' . $resource;
} elseif ($isSpacesDavPathVersion && \str_starts_with($resource, "Shares/")) {
$resource = \preg_replace("/^Shares\//", "", $resource);
}
$this->featureContext->setResponse($this->uploadFileViaTus($user, $content, $resource, $spaceName));
}

Expand Down
32 changes: 18 additions & 14 deletions tests/acceptance/bootstrap/TUSContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,17 +442,13 @@ public function userUploadsAFileWithContentToUsingTus(
string $destination
): void {
$temporaryFileName = $this->writeDataToTempFile($content);
try {
$this->uploadFileUsingTus(
$user,
\basename($temporaryFileName),
$destination
);
$this->featureContext->setLastUploadDeleteTime(\time());
} catch (Exception $e) {
Assert::assertStringContainsString('TusPhp\Exception\FileException: Unable to create resource', (string)$e);
}
$response = $this->uploadFileUsingTus(
$user,
\basename($temporaryFileName),
$destination
);
\unlink($temporaryFileName);
$this->featureContext->setResponse($response);
}

/**
Expand All @@ -479,7 +475,7 @@ public function userUploadsAFileWithContentInChunksUsingTus(
string $destination
): void {
$temporaryFileName = $this->writeDataToTempFile($content);
$this->uploadFileUsingTus(
$response = $this->uploadFileUsingTus(
$user,
\basename($temporaryFileName),
$destination,
Expand All @@ -489,6 +485,7 @@ public function userUploadsAFileWithContentInChunksUsingTus(
);
$this->featureContext->setLastUploadDeleteTime(\time());
\unlink($temporaryFileName);
$this->featureContext->setResponse($response);
}

/**
Expand All @@ -512,14 +509,19 @@ public function userHasUploadedFileWithMtimeUsingTUS(
$mtime = new DateTime($mtime);
$mtime = $mtime->format('U');
$user = $this->featureContext->getActualUsername($user);
$this->uploadFileUsingTus(
$response = $this->uploadFileUsingTus(
$user,
$source,
$destination,
null,
['mtime' => $mtime]
);
$this->featureContext->setLastUploadDeleteTime(\time());
$this->featureContext->theHTTPStatusCodeShouldBe(
["201", "204"],
"Failed to upload file '$source' for user '$user'",
$response
);
}

/**
Expand All @@ -543,14 +545,15 @@ public function userUploadsFileWithContentToWithMtimeUsingTUS(
$mtime = new DateTime($mtime);
$mtime = $mtime->format('U');
$user = $this->featureContext->getActualUsername($user);
$this->uploadFileUsingTus(
$response = $this->uploadFileUsingTus(
$user,
$source,
$destination,
null,
['mtime' => $mtime]
);
$this->featureContext->setLastUploadDeleteTime(\time());
$this->featureContext->setResponse($response);
}

/**
Expand Down Expand Up @@ -628,7 +631,7 @@ public function userUploadsWithCreatesWithUpload(
string $content
): void {
$temporaryFileName = $this->writeDataToTempFile($content);
$this->uploadFileUsingTus(
$response = $this->uploadFileUsingTus(
$user,
\basename($temporaryFileName),
$source,
Expand All @@ -639,6 +642,7 @@ public function userUploadsWithCreatesWithUpload(
);
$this->featureContext->setLastUploadDeleteTime(\time());
\unlink($temporaryFileName);
$this->featureContext->setResponse($response);
}

/**
Expand Down
1 change: 1 addition & 0 deletions tests/acceptance/config/behat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,7 @@ default:
- FilesVersionsContext:
- ChecksumContext:
- SharingNgContext:
- SpacesTUSContext:

coreApiWebdavEtagPropagation1:
paths:
Expand Down
18 changes: 9 additions & 9 deletions tests/acceptance/expected-failures-API-on-OCIS-storage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,12 @@ _ocdav: api compatibility, return correct status code_
- [coreApiWebdavUploadTUS/checksums.feature:243](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/checksums.feature#L243)
- [coreApiWebdavUploadTUS/checksums.feature:244](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/checksums.feature#L244)
- [coreApiWebdavUploadTUS/checksums.feature:245](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/checksums.feature#L245)
- [coreApiWebdavUploadTUS/uploadToShare.feature:255](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L255)
- [coreApiWebdavUploadTUS/uploadToShare.feature:256](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L256)
- [coreApiWebdavUploadTUS/uploadToShare.feature:279](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L279)
- [coreApiWebdavUploadTUS/uploadToShare.feature:280](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L280)
- [coreApiWebdavUploadTUS/uploadToShare.feature:375](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L375)
- [coreApiWebdavUploadTUS/uploadToShare.feature:376](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L376)
- [coreApiWebdavUploadTUS/uploadToShare.feature:264](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L264)
- [coreApiWebdavUploadTUS/uploadToShare.feature:265](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L265)
- [coreApiWebdavUploadTUS/uploadToShare.feature:288](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L288)
- [coreApiWebdavUploadTUS/uploadToShare.feature:289](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L289)
- [coreApiWebdavUploadTUS/uploadToShare.feature:385](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L385)
- [coreApiWebdavUploadTUS/uploadToShare.feature:386](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L386)

#### [Renaming resource to banned name is allowed in spaces webdav](https://github.com/owncloud/ocis/issues/3099)

Expand Down Expand Up @@ -200,9 +200,9 @@ _ocdav: api compatibility, return correct status code_
- [coreApiWebdavUpload/uploadFile.feature:400](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUpload/uploadFile.feature#L400)
- [coreApiWebdavUpload/uploadFile.feature:401](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUpload/uploadFile.feature#L401)
- [coreApiWebdavUpload/uploadFile.feature:402](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUpload/uploadFile.feature#L402)
- [coreApiWebdavUploadTUS/uploadFileMtime.feature:79](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L79)
- [coreApiWebdavUploadTUS/uploadFileMtime.feature:80](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L80)
- [coreApiWebdavUploadTUS/uploadFileMtime.feature:81](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L81)
- [coreApiWebdavUploadTUS/uploadFileMtime.feature:84](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L84)
- [coreApiWebdavUploadTUS/uploadFileMtime.feature:85](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L85)
- [coreApiWebdavUploadTUS/uploadFileMtime.feature:86](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L86)

### Won't fix

Expand Down
Loading