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.

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

[tests-only][full-ci] added test scenario for searching inside folder in space #6972

Merged
merged 1 commit into from
Aug 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 14 additions & 2 deletions tests/acceptance/features/apiSpaces/search.feature
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@api
@api
Feature: Search
As a user
As a user
I want to search for resources in the space
So that I can get them quickly

Expand Down Expand Up @@ -109,3 +109,15 @@ Feature: Search
Then the HTTP status code should be "207"
And the search result should contain "1" entries
And for user "Alice" the search result should contain space "find data"


Scenario: user can search inside folder in space
When user "Alice" searches for "folder" inside folder "/folderMain" in space "find data" using the WebDAV API
saw-jan marked this conversation as resolved.
Show resolved Hide resolved
Then the HTTP status code should be "207"
And the search result should contain "3" entries
And the search result of user "Alice" should contain only these entries:
| /SubFolder1 |
| /SubFolder1/subFOLDER2 |
| /SubFolder1/subFOLDER2/insideTheFolder.txt |
But the search result of user "Alice" should not contain these entries:
| /folderMain |
9 changes: 8 additions & 1 deletion tests/acceptance/features/bootstrap/SearchContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,13 @@ class SearchContext implements Context {
* @When user :user searches for :pattern using the WebDAV API requesting these properties:
* @When user :user searches for :pattern and limits the results to :limit items using the WebDAV API requesting these properties:
* @When user :user searches for :pattern inside folder :scope using the WebDAV API
* @When user :user searches for :pattern inside folder :scope in space :spaceName using the WebDAV API
*
* @param string $user
* @param string $pattern
* @param string|null $limit
* @param string|null $scope
* @param string|null $spaceName
* @param TableNode|null $properties
*
* @return void
Expand All @@ -54,6 +56,7 @@ public function userSearchesUsingWebDavAPI(
string $pattern,
?string $limit = null,
?string $scope = null,
?string $spaceName = null,
TableNode $properties = null
):void {
// Because indexing of newly uploaded files or directories with ocis is decoupled and occurs asynchronously, a short wait is necessary before searching files or folders.
Expand All @@ -66,7 +69,11 @@ public function userSearchesUsingWebDavAPI(
= "<?xml version='1.0' encoding='utf-8' ?>\n" .
" <oc:search-files xmlns:a='DAV:' xmlns:oc='http://owncloud.org/ns' >\n" .
" <oc:search>\n";
if ($scope !== null) {
if ($scope !== null && $spaceName !== null) {
$scope = \trim($scope, "/");
$spaceId = $this->featureContext->spacesContext->getSpaceIdByName($user, $spaceName);
$pattern .= " scope:$spaceId/$scope";
} elseif ($scope !== null) {
$scope = \trim($scope, "/");
if ($this->featureContext->getDavPathVersion() === 3) {
$rootPath = $this->featureContext->getPersonalSpaceIdForUser($user);
Expand Down