mirror of
https://github.com/nextcloud/server.git
synced 2026-02-27 18:37:17 +01:00
test(Sharing): Integration test for no expiration set date for share
- Verify that explicitly sending empty `expireDate` param to server overwrite default and sets not expiry date, if non is enforced. - Update tests to avoid converting empty string to date. Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
This commit is contained in:
@@ -54,7 +54,9 @@ trait Sharing {
|
||||
$fd = $body->getRowsHash();
|
||||
if (array_key_exists('expireDate', $fd)) {
|
||||
$dateModification = $fd['expireDate'];
|
||||
$fd['expireDate'] = date('Y-m-d', strtotime($dateModification));
|
||||
if (!empty($dateModification)) {
|
||||
$fd['expireDate'] = date('Y-m-d', strtotime($dateModification));
|
||||
}
|
||||
}
|
||||
$options['form_params'] = $fd;
|
||||
}
|
||||
@@ -301,7 +303,9 @@ trait Sharing {
|
||||
public function isFieldInResponse($field, $contentExpected) {
|
||||
$data = simplexml_load_string($this->response->getBody())->data[0];
|
||||
if ((string)$field == 'expiration') {
|
||||
$contentExpected = date('Y-m-d', strtotime($contentExpected)) . " 00:00:00";
|
||||
if(!empty($contentExpected)) {
|
||||
$contentExpected = date('Y-m-d', strtotime($contentExpected)) . " 00:00:00";
|
||||
}
|
||||
}
|
||||
if (count($data->element) > 0) {
|
||||
foreach ($data as $element) {
|
||||
|
||||
@@ -229,6 +229,24 @@ Feature: sharing
|
||||
| url | AN_URL |
|
||||
| mimetype | httpd/unix-directory |
|
||||
|
||||
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_expire_date" of app "core" is set to "yes"
|
||||
And As an "user0"
|
||||
When creating a share with
|
||||
| path | welcome.txt |
|
||||
| shareWith | user1 |
|
||||
| shareType | 0 |
|
||||
| expireDate | |
|
||||
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 ||
|
||||
|
||||
Scenario: Creating a new public share, updating its password and getting its info
|
||||
Given user "user0" exists
|
||||
And As an "user0"
|
||||
|
||||
Reference in New Issue
Block a user