Skip to content
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

[Test-only] reva now returns 404 when trying to delete a nonexisting file #37149

Merged
merged 2 commits into from
Mar 20, 2020
Merged

[Test-only] reva now returns 404 when trying to delete a nonexisting file #37149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b747254
reva now returns 404 when trying to deleta a nonexisting file
butonic Mar 20, 2020
743cd81
reva ocs api return codes and messages also got slightly better
butonic Mar 20, 2020
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
28 changes: 14 additions & 14 deletions tests/acceptance/features/apiShareCreateSpecial2/createShareWithInvalidPermissions.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ Feature: cannot share resources with invalid permissions
And as "user1" entry "<item>" should not exist
Examples:
| ocs_api_version | ocs_status_code | http_status_code | item | permissions |
| 1 | 996 | 200 | textfile0.txt | 0 |
| 2 | 996 | 200 | textfile0.txt | 0 |
| 1 | 996 | 200 | PARENT | 0 |
| 2 | 996 | 200 | PARENT | 0 |
| 1 | 996 | 200 | textfile0.txt | 32 |
| 2 | 996 | 200 | textfile0.txt | 32 |
| 1 | 996 | 200 | PARENT | 32 |
| 2 | 996 | 200 | PARENT | 32 |
| 1 | 400 | 200 | textfile0.txt | 0 |
| 2 | 400 | 200 | textfile0.txt | 0 |
| 1 | 400 | 200 | PARENT | 0 |
| 2 | 400 | 200 | PARENT | 0 |
| 1 | 400 | 200 | textfile0.txt | 32 |
| 2 | 400 | 200 | textfile0.txt | 32 |
| 1 | 400 | 200 | PARENT | 32 |
| 2 | 400 | 200 | PARENT | 32 |

@skipOnOcis @issue-ocis-reva-45 @issue-ocis-reva-64
Scenario Outline: Cannot create a share of a file with a user with only create permission
Expand Down Expand Up @@ -85,8 +85,8 @@ Feature: cannot share resources with invalid permissions
And as "user1" entry "textfile0.txt" should not exist
Examples:
| ocs_api_version | ocs_status_code | http_status_code |
| 1 | 996 | 200 |
| 2 | 996 | 200 |
| 1 | 100 | 200 |
| 2 | 100 | 200 |

@skipOnOcis @issue-ocis-reva-45 @issue-ocis-reva-64
Scenario Outline: Cannot create a share of a file with a user with only (create,delete) permission
Expand Down Expand Up @@ -122,10 +122,10 @@ Feature: cannot share resources with invalid permissions
And as "user1" entry "textfile0.txt" should not exist
Examples:
| ocs_api_version | ocs_status_code | http_status_code | permissions |
| 1 | 996 | 200 | delete |
| 2 | 996 | 200 | delete |
| 1 | 996 | 200 | create,delete |
| 2 | 996 | 200 | create,delete |
| 1 | 100 | 200 | delete |
| 2 | 100 | 200 | delete |
| 1 | 100 | 200 | create,delete |
| 2 | 100 | 200 | create,delete |

@skipOnOcis @issue-ocis-reva-34
Scenario Outline: Cannot create a share of a file with a group with only create permission
Expand Down
40 changes: 20 additions & 20 deletions tests/acceptance/features/apiShareManagementBasic/createShare.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,21 +84,21 @@ Feature: sharing
When user "user0" shares file "textfile0.txt" with user "user1" with permissions <requested_permissions> using the sharing API
Then the OCS status code should be "<ocs_status_code>"
And the HTTP status code should be "200"
And the OCS status message should be "grpc stat request failed"
And the OCS status message should be "OK"
Examples:
| ocs_api_version | requested_permissions | granted_permissions | ocs_status_code |
# Ask for full permissions. You get share plus read plus update. create and delete do not apply to shares of a file
| 1 | 31 | 31 | 996 |
| 2 | 31 | 31 | 996 |
| 1 | 31 | 31 | 100 |
| 2 | 31 | 31 | 100 |
# Ask for read, share (17), create and delete. You get share plus read
| 1 | 29 | 31 | 996 |
| 2 | 29 | 31 | 996 |
| 1 | 29 | 31 | 100 |
| 2 | 29 | 31 | 100 |
# Ask for read, update, create, delete. You get read plus update.
| 1 | 15 | 15 | 996 |
| 2 | 15 | 15 | 996 |
| 1 | 15 | 15 | 100 |
| 2 | 15 | 15 | 100 |
# Ask for just update. You get exactly update (you do not get read or anything else)
| 1 | 2 | 2 | 996 |
| 2 | 2 | 2 | 996 |
| 1 | 2 | 2 | 100 |
| 2 | 2 | 2 | 100 |

@skipOnOcis
@issue-ocis-reva-45
Expand All @@ -125,8 +125,8 @@ Feature: sharing
And user "user1" has been created with default attributes and without skeleton files
And user "user0" has uploaded file with content "user0 file" to "randomfile.txt"
When user "user0" shares file "randomfile.txt" with user "user1" with permissions "0" using the sharing API
Then the OCS status code should be "996"
And the OCS status message should be "grpc stat request failed"
Then the OCS status code should be "400"
And the OCS status message should be "permissions 0 out of range 1 - 31"
And the HTTP status code should be "<http_status_code>"
And as "user1" file "randomfile.txt" should not exist
Examples:
Expand All @@ -142,8 +142,8 @@ Feature: sharing
And user "user1" has been created with default attributes and without skeleton files
And user "user0" has uploaded file with content "user0 file" to "randomfile.txt"
When user "user0" shares file "/randomfile.txt" with user "user1" using the sharing API
Then the OCS status code should be "998"
And the OCS status message should be "not found"
Then the OCS status code should be "100"
And the OCS status message should be "OK"
And the HTTP status code should be "<http_status_code>"
And as "user1" file "randomfile.txt" should not exist
Examples:
Expand Down Expand Up @@ -222,8 +222,8 @@ Feature: sharing
And user "user1" has been created with default attributes and without skeleton files
And user "user0" has created folder "/afolder"
When user "user0" shares folder "afolder" with user "user1" with permissions "0" using the sharing API
Then the OCS status code should be "996"
And the OCS status message should be "grpc stat request failed"
Then the OCS status code should be "400"
And the OCS status message should be "permissions 0 out of range 1 - 31"
And the HTTP status code should be "<http_status_code>"
And as "user1" folder "afolder" should not exist
Examples:
Expand Down Expand Up @@ -274,12 +274,12 @@ Feature: sharing
And user "user0" has created folder "/FOLDER"
When user "user0" shares folder "/FOLDER" with user "user1" using the sharing API
Then the OCS status code should be "<ocs_status_code>"
And the OCS status message should be "not found"
And the OCS status message should be "OK"
And the HTTP status code should be "200"
Examples:
| ocs_api_version | ocs_status_code |
| 1 | 998 |
| 2 | 998 |
| 1 | 100 |
| 2 | 100 |

@skipOnOcis @issue-ocis-reva-34
Scenario Outline: Creating a share of a file with a group, the default permissions are read(1)+update(2)+can-share(16)
Expand Down Expand Up @@ -620,7 +620,7 @@ Feature: sharing
| /common/sub/textfile0.txt |
| /textfile0.txt |

@issue-enterprise-3896
@skipOnOcis @issue-enterprise-3896
Scenario: sharing back to resharer is allowed
Given these users have been created with default attributes and without skeleton files:
| username |
Expand All @@ -635,7 +635,7 @@ Feature: sharing
# Then the HTTP status code should be "405"
And as "user1" folder "userOneFolder" should not exist

@issue-enterprise-3896
@skipOnOcis @issue-enterprise-3896
Scenario: sharing back to original sharer is allowed
Given these users have been created with default attributes and without skeleton files:
| username |
Expand Down
20 changes: 7 additions & 13 deletions tests/acceptance/features/bootstrap/WebDav.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1275,20 +1275,14 @@ public function asFileOrFolderShouldNotExist(
$this->getPasswordForUser($user), 'GET', $path,
[], null, 2, $type
);
$actualCode = $response->getStatusCode();
$message = "$entry '$path' expected to not exist " .
"(status code {$actualCode}, expected ";

if (OcisHelper::isTestingOnOcis()) {
//OCIS currently shows error 500 when accessing a not existing file
//https://github.com/owncloud/ocis-reva/issues/13
Assert::assertEquals(500, $actualCode, $message . "500)");
} else {
$message .= "401 - 404)";
Assert::assertGreaterThanOrEqual(401, $actualCode, $message);
Assert::assertLessThanOrEqual(404, $actualCode, $message);

if ($response->getStatusCode() < 401 || $response->getStatusCode() > 404) {
throw new \Exception(
"$entry '$path' expected to not exist " .
"(status code {$response->getStatusCode()}, expected 401 - 404)"
);
Comment on lines +1279 to +1283
Copy link
Contributor

@phil-davis phil-davis Mar 20, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We like to use Assert where we can in Then steps - it provides a nicer output on failure than a long traceback. But that sort of stuff has been refactored more recently, so I guess the revert has done this.
We can adjust that later, since it will be better to get this PR merged so that OCIS-related tests can pass.

}

return $response;
}

Expand Down