Skip to content

Make consistent file-folder-entry test steps #35656

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
micbar merged 1 commit into from
Jun 26, 2019
Merged

Make consistent file-folder-entry test steps #35656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions tests/acceptance/features/apiShareManagementBasic/createShare.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,8 @@ Feature: sharing
And user "user1" has been created with default attributes and skeleton files
And group "grp4" has been created
And user "user1" has been added to group "grp4"
When user "user0" shares file "/PARENT" with user "user1" using the sharing API
And user "user0" shares file "/PARENT/CHILD" with group "grp4" using the sharing API
When user "user0" shares folder "/PARENT" with user "user1" using the sharing API
And user "user0" shares folder "/PARENT/CHILD" with group "grp4" using the sharing API
Then user "user1" should see the following elements
| /FOLDER/ |
| /PARENT/ |
Expand Down Expand Up @@ -410,8 +410,8 @@ Feature: sharing
| user2 |
And user "user0" has created folder "/foo"
And user "user1" has created folder "/foo"
When user "user0" shares file "/foo" with user "user2" using the sharing API
And user "user1" shares file "/foo" with user "user2" using the sharing API
When user "user0" shares folder "/foo" with user "user2" using the sharing API
And user "user1" shares folder "/foo" with user "user2" using the sharing API
Then user "user2" should see the following elements
| /foo/ |
| /foo%20(2)/ |
Expand All @@ -437,8 +437,8 @@ Feature: sharing
And group "grp1" has been created
And user "user0" has created folder "/test"
And user "user0" has created folder "/test/sub"
And user "user0" has shared file "/test" with group "grp1"
When user "user0" shares file "/test/sub" with user "user1" using the sharing API
And user "user0" has shared folder "/test" with group "grp1"
When user "user0" shares folder "/test/sub" with user "user1" using the sharing API
Then the OCS status code should be "<ocs_status_code>"
And the HTTP status code should be "200"
And as "user1" folder "/sub" should exist
Expand All @@ -454,8 +454,8 @@ Feature: sharing
And user "user0" has been added to group "grp1"
And user "user0" has created folder "/test"
And user "user0" has created folder "/test/sub"
And user "user0" has shared file "/test" with group "grp1"
When user "user0" shares file "/test/sub" with user "user1" using the sharing API
And user "user0" has shared folder "/test" with group "grp1"
When user "user0" shares folder "/test/sub" with user "user1" using the sharing API
Then the OCS status code should be "<ocs_status_code>"
And the HTTP status code should be "200"
And as "user1" folder "/sub" should exist
Expand All @@ -473,22 +473,22 @@ Feature: sharing
| user3 |
| user4 |
And user "user0" has created folder "/folder1"
And user "user0" has shared file "/folder1" with user "user1"
And user "user0" has shared file "/folder1" with user "user2"
And user "user0" has shared folder "/folder1" with user "user1"
And user "user0" has shared folder "/folder1" with user "user2"
And user "user0" has created folder "/folder1/folder2"
And user "user0" has shared file "/folder1/folder2" with user "user3"
And user "user0" has shared file "/folder1/folder2" with user "user4"
And user "user0" has shared folder "/folder1/folder2" with user "user3"
And user "user0" has shared folder "/folder1/folder2" with user "user4"
And as user "user0"
When the user sends HTTP method "GET" to OCS API endpoint "/apps/files_sharing/api/v1/shares"
Then the OCS status code should be "<ocs_status_code>"
And the HTTP status code should be "200"
And the response should contain 4 entries
And file "/folder1" should be included as path in the response
And file "/folder1/folder2" should be included as path in the response
And folder "/folder1" should be included as path in the response
And folder "/folder1/folder2" should be included as path in the response
And the user sends HTTP method "GET" to OCS API endpoint "/apps/files_sharing/api/v1/shares?path=/folder1/folder2"
And the response should contain 2 entries
And file "/folder1" should not be included as path in the response
And file "/folder1/folder2" should be included as path in the response
And folder "/folder1" should not be included as path in the response
And folder "/folder1/folder2" should be included as path in the response
Examples:
| ocs_api_version | ocs_status_code |
| 1 | 100 |
Expand Down Expand Up @@ -572,7 +572,7 @@ Feature: sharing
And parameter "shareapi_exclude_groups" of app "core" has been set to "yes"
And parameter "shareapi_exclude_groups_list" of app "core" has been set to '["excludedFromSharing"]'
And user "user0" has created folder "folderToShare"
When user "user0" shares file "folderToShare" with group "anotherGroup" using the sharing API
When user "user0" shares folder "folderToShare" with group "anotherGroup" using the sharing API
Then the OCS status code should be "403"
And the HTTP status code should be "<http_status_code>"
And as "user1" file "folderToShare" should not exist
Expand Down
16 changes: 8 additions & 8 deletions tests/acceptance/features/apiShareManagementBasic/deleteShare.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,24 +62,24 @@ Feature: sharing
| user3 |
| user4 |
And user "user0" has created folder "/folder1"
And user "user0" has shared file "/folder1" with user "user1"
And user "user0" has shared file "/folder1" with user "user2"
And user "user0" has shared folder "/folder1" with user "user1"
And user "user0" has shared folder "/folder1" with user "user2"
And user "user0" has created folder "/folder1/folder2"
And user "user0" has shared file "/folder1/folder2" with user "user3"
And user "user0" has shared file "/folder1/folder2" with user "user4"
And user "user0" has shared folder "/folder1/folder2" with user "user3"
And user "user0" has shared folder "/folder1/folder2" with user "user4"
And as user "user0"
When the user sends HTTP method "GET" to OCS API endpoint "/apps/files_sharing/api/v1/shares"
Then the OCS status code should be "<ocs_status_code>"
And the HTTP status code should be "200"
And the response should contain 4 entries
And file "/folder1" should be included as path in the response
And file "/folder1/folder2" should be included as path in the response
And folder "/folder1" should be included as path in the response
And folder "/folder1/folder2" should be included as path in the response
When the user sends HTTP method "GET" to OCS API endpoint "/apps/files_sharing/api/v1/shares?path=/folder1/folder2"
Then the OCS status code should be "<ocs_status_code>"
And the HTTP status code should be "200"
And the response should contain 2 entries
And file "/folder1" should not be included as path in the response
And file "/folder1/folder2" should be included as path in the response
And folder "/folder1" should not be included as path in the response
And folder "/folder1/folder2" should be included as path in the response
Examples:
| ocs_api_version | ocs_status_code |
| 1 | 100 |
Expand Down
8 changes: 4 additions & 4 deletions tests/acceptance/features/bootstrap/Sharing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ public function isFieldInResponse($field, $contentExpected, $expectSuccess = tru
}

/**
* @Then /^file "([^"]*)" should be included in the response$/
* @Then /^(?:file|folder|entry) "([^"]*)" should be included in the response$/
*
* @param string $filename
*
Expand All @@ -745,7 +745,7 @@ public function checkSharedFileInResponse($filename) {
}

/**
* @Then /^file "([^"]*)" should not be included in the response$/
* @Then /^(?:file|folder|entry) "([^"]*)" should not be included in the response$/
*
* @param string $filename
*
Expand All @@ -760,7 +760,7 @@ public function checkSharedFileNotInResponse($filename) {
}

/**
* @Then /^file "([^"]*)" should be included as path in the response$/
* @Then /^(?:file|folder|entry) "([^"]*)" should be included as path in the response$/
*
* @param string $filename
*
Expand All @@ -775,7 +775,7 @@ public function checkSharedFileAsPathInResponse($filename) {
}

/**
* @Then /^file "([^"]*)" should not be included as path in the response$/
* @Then /^(?:file|folder|entry) "([^"]*)" should not be included as path in the response$/
*
* @param string $filename
*
Expand Down
7 changes: 4 additions & 3 deletions tests/acceptance/features/bootstrap/TagsContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ public function sharedByHasTheFollowingTags(
}

/**
* @Then /^file "([^"]*)" should have the following tags for the (administrator|user)$/
* @Then /^(?:file|folder|entry) "([^"]*)" should have the following tags for the (administrator|user)$/
*
* @param string $fileName
* @param string $adminOrUser
Expand Down Expand Up @@ -913,8 +913,9 @@ public function sharedByHasNoTags($fileName, $sharingUser) {
}

/**
* @Then file :fileName should have no tags for user :user
* @Then /^file "([^"]*)" should have no tags for the (administrator|user)?$/
* @Then file/folder :fileName should have no tags for user :user
* @Then entry :fileName should have no tags for user :user
* @Then /^(?:file|folder|entry) "([^"]*)" should have no tags for the (administrator|user)?$/
*
* @param string $fileName
* @param string $adminOrUser
Expand Down