sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(files_sharing): expireDate null tests 

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
pull/52072/head
skjnldsv 2025-04-09 11:14:23 +07:00
parent f37026034e
commit 6a0d92dedf
3 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/integration/features/bootstrap/Sharing.php
Unescape Escape View File

@ -54,8 +54,12 @@ trait Sharing {
$fd = $body->getRowsHash(); $fd = $body->getRowsHash();
if (array_key_exists('expireDate', $fd)) { if (array_key_exists('expireDate', $fd)) {
$dateModification = $fd['expireDate']; $dateModification = $fd['expireDate'];
if (!empty($dateModification)) { if ($dateModification === 'null') {
$fd['expireDate'] = null;
} elseif (!empty($dateModification)) {
$fd['expireDate'] = date('Y-m-d', strtotime($dateModification)); $fd['expireDate'] = date('Y-m-d', strtotime($dateModification));
} else {
$fd['expireDate'] = '';
} }
} }
$options['form_params'] = $fd; $options['form_params'] = $fd;

42
build/integration/sharing_features/sharing-v1.feature
Unescape Escape View File

@ -231,10 +231,11 @@ Feature: sharing
| url | AN_URL | | url | AN_URL |
| mimetype | httpd/unix-directory | | mimetype | httpd/unix-directory |
Scenario: Creating a new share with expiration date removed, when default expiration is set Scenario: Creating a new share with expiration date empty, when default expiration is set
Given user "user0" exists Given user "user0" exists
And user "user1" exists And user "user1" exists
And parameter "shareapi_default_expire_date" of app "core" is set to "yes" And parameter "shareapi_default_internal_expire_date" of app "core" is set to "yes"
And parameter "shareapi_internal_expire_after_n_days" of app "core" is set to "3"
And As an "user0" And As an "user0"
When creating a share with When creating a share with
| path | welcome.txt | | path | welcome.txt |
@ -249,6 +250,43 @@ Feature: sharing
And Share fields of last share match with And Share fields of last share match with
| expiration || | expiration ||
Scenario: Creating a new share with expiration date removed, when default expiration is set
Given user "user0" exists
And user "user1" exists
And parameter "shareapi_default_internal_expire_date" of app "core" is set to "yes"
And parameter "shareapi_internal_expire_after_n_days" of app "core" is set to "3"
And As an "user0"
When creating a share with
| path | welcome.txt |
| shareWith | user1 |
| shareType | 0 |
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And Getting info of last share
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And Share fields of last share match with
| expiration | +3 days |
Scenario: Creating a new share with expiration date null, when default expiration is set
Given user "user0" exists
And user "user1" exists
And parameter "shareapi_default_internal_expire_date" of app "core" is set to "yes"
And parameter "shareapi_internal_expire_after_n_days" of app "core" is set to "3"
And As an "user0"
When creating a share with
| path | welcome.txt |
| shareWith | user1 |
| shareType | 0 |
| expireDate | null |
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And Getting info of last share
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And Share fields of last share match with
| expiration | +3 days |
Scenario: Creating a new public share, updating its password and getting its info Scenario: Creating a new public share, updating its password and getting its info
Given user "user0" exists Given user "user0" exists
And As an "user0" And As an "user0"

2
lib/public/Share/IShare.php
Unescape Escape View File

@ -379,7 +379,7 @@ interface IShare {
public function getExpirationDate(); public function getExpirationDate();
/** /**
* Set overwrite flag for falsy expiry date vavlues * Set overwrite flag for falsy expiry date values
* *
* @param bool $noExpirationDate * @param bool $noExpirationDate
* @return \OCP\Share\IShare The modified object * @return \OCP\Share\IShare The modified object