upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-03 20:41:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 37

chore(integration): add file request tests

Browse source 
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
This commit is contained in:
skjnldsv 2024-07-18 20:59:50 +02:00
parent 481551eebf
commit 725736a754
3 changed files with 52 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/dav/lib/Files/Sharing/FilesDropPlugin.php
View file

@ -62,14 +62,12 @@ class FilesDropPlugin extends ServerPlugin {
$path = array_pop($path);
// Extract the attributes for the file request
$isFileRequest = false;
$attributes = $this->share->getAttributes();
if ($attributes === null) {
return;
}
// Prepare file request
$nickName = $request->getHeader('X-NC-Nickname');
$isFileRequest = $attributes->getAttribute('fileRequest', 'enabled') === true;
if ($attributes !== null) {
$isFileRequest = $attributes->getAttribute('fileRequest', 'enabled') === true;
}
// We need a valid nickname for file requests
if ($isFileRequest && ($nickName == null || trim($nickName) === '')) {

20
build/integration/features/bootstrap/FilesDropContext.php
View file

@ -15,7 +15,7 @@ class FilesDropContext implements Context, SnippetAcceptingContext {
/**
* @When Dropping file :path with :content
*/
public function droppingFileWith($path, $content) {
public function droppingFileWith($path, $content, $nickName = null) {
$client = new Client();
$options = [];
if (count($this->lastShareData->data->element) > 0) {
@ -25,11 +25,16 @@ class FilesDropContext implements Context, SnippetAcceptingContext {
}
$base = substr($this->baseUrl, 0, -4);
$fullUrl = $base . "/public.php/dav/files/$token/$path";
$fullUrl = str_replace('//', '/', $base . "/public.php/dav/files/$token/$path");
$options['headers'] = [
'X-REQUESTED-WITH' => 'XMLHttpRequest'
];
if ($nickName) {
$options['headers']['X-NC-NICKNAME'] = $nickName;
}
$options['body'] = \GuzzleHttp\Psr7\Utils::streamFor($content);
try {
@ -38,6 +43,15 @@ class FilesDropContext implements Context, SnippetAcceptingContext {
$this->response = $e->getResponse();
}
}
/**
* @When Dropping file :path with :content as :nickName
*/
public function droppingFileWithAs($path, $content, $nickName) {
$this->droppingFileWith($path, $content, $nickName);
}
/**
* @When Creating folder :folder in drop
@ -52,7 +66,7 @@ class FilesDropContext implements Context, SnippetAcceptingContext {
}
$base = substr($this->baseUrl, 0, -4);
$fullUrl = $base . "/public.php/dav/files/$token/$folder";
$fullUrl = str_replace('//', '/', $base . "/public.php/dav/files/$token/$folder");
$options['headers'] = [
'X-REQUESTED-WITH' => 'XMLHttpRequest'

31
build/integration/filesdrop_features/filesdrop.feature
View file

@ -59,3 +59,34 @@ Feature: FilesDrop
| permissions | 4 |
When Creating folder "folder" in drop
Then the HTTP status code should be "405"
Scenario: Files request drop
Given user "user0" exists
And As an "user0"
And user "user0" created a folder "/drop"
And as "user0" creating a share with
| path | drop |
| shareType | 4 |
| permissions | 4 |
| attributes | [{"scope":"fileRequest","key":"enabled","value":true}] |
| shareWith | |
When Dropping file "/folder/a.txt" with "abc" as "Alice"
And Downloading file "/drop/Alice/a.txt"
Then Downloaded content should be "abc"
Scenario: Put file same file multiple times via files drop
Given user "user0" exists
And As an "user0"
And user "user0" created a folder "/drop"
And as "user0" creating a share with
| path | drop |
| shareType | 4 |
| permissions | 4 |
| attributes | [{"scope":"fileRequest","key":"enabled","value":true}] |
| shareWith | |
When Dropping file "/folder/a.txt" with "abc" as "Mallory"
And Dropping file "/folder/a.txt" with "def" as "Mallory"
And Downloading file "/drop/Mallory/a.txt"
Then Downloaded content should be "abc"
And Downloading file "/drop/Mallory/a (2).txt"
Then Downloaded content should be "def"