Skip to content

Commit

Permalink
updated feature file to remove trailing slash for folder propfind req…
Browse files Browse the repository at this point in the history 
…uest
  • Loading branch information
@S-Panta
S-Panta committed Nov 11, 2024
1 parent e796899 commit a68e343
Show file tree
Hide file tree
Showing 11 changed files with 102 additions and 100 deletions.
24 changes: 13 additions & 11 deletions tests/acceptance/bootstrap/WebDav.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1573,32 +1573,34 @@ public function checkElementList(
// /some-folder%20with%20spaces/sub-folder
// So we need both $elementToRequest and $expectedElement
$expectedElement = $this->encodePath($elementToRequest);

$responseXmlObject = $this->listFolderAndReturnResponseXml(
$user,
$elementToRequest,
"1"
);

// TODO: make it work for folder entries
// Doesn't work for folder entries
// as the folder entry has trailing '/' in d:href
$webdavPath = "/" . $this->getFullDavFilesPath($user) . $expectedElement;
// return xmlobject that matches the x-path pattern.
$element = $responseXmlObject->xpath(
"//d:response/d:href[text() = \"$webdavPath\"]"
"//d:response/d:href"
);

if ($expectedToBeListed
&& (!isset($element[0]) || urldecode($element[0]->__toString()) !== urldecode($webdavPath))
) {
Assert::fail(
"$webdavPath is not in propfind answer but should be"
);
} elseif (!$expectedToBeListed && isset($element[0])
if (!$expectedToBeListed && isset($element[0])
) {
Assert::fail(
"$webdavPath is in propfind answer but should not be"
);
};
if ($expectedToBeListed) {
$elementSanitized = rtrim($element[0]->__toString(), '/');
if (!isset($element[0]) || urldecode($elementSanitized) !== urldecode($webdavPath)) {
Assert::fail(
"$webdavPath is not in propfind answer but should be"
);
}
}

}
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...ptance/features/coreApiShareCreateSpecialToShares1/createShareUniqueReceivedNames.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Feature: resources shared with the same name are received with unique names
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "Carol" should see the following elements
| Shares/foo/ |
| /Shares/foo (1)/ |
| Shares/foo |
| /Shares/foo (1) |

@smokeTest @issue-2131
Scenario: unique target names for incoming shares when auto-accepting is disabled
Expand All @@ -34,5 +34,5 @@ Feature: resources shared with the same name are received with unique names
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "Carol" should see the following elements
| Shares/foo/ |
| /Shares/foo (1)/ |
| Shares/foo |
| /Shares/foo (1) |
4 changes: 2 additions & 2 deletions ...nce/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ Feature: share resources where the sharee receives the share in multiple ways
Then the OCS status code should be "<ocs-status-code>"
And the HTTP status code should be "200"
And user "Brian" should see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/PARENT/parent.txt |
| /Shares/CHILD/ |
| /Shares/CHILD |
| /Shares/CHILD/child.txt |
Examples:
| ocs-api-version | ocs-status-code |
Expand Down
12 changes: 6 additions & 6 deletions ...acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,10 @@ Feature: sharing
And user "Alice" has uploaded file with content "file in parent folder" to "/PARENT/parent.txt"
When user "Alice" shares folder "/PARENT" with group "grp1" using the sharing API
And user "Brian" should see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/PARENT/parent.txt |
And user "Carol" should see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/PARENT/parent.txt |

@smokeTest @skipOnReva # reva doesn't have a pre-created admin user
Expand All @@ -230,7 +230,7 @@ Feature: sharing
And admin has created folder "/PARENT"
When user "admin" shares folder "/PARENT" with group "grp1" using the sharing API
Then user "Alice" should see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |

@smokeTest
Scenario: user included in multiple groups, shares a folder with a group
Expand All @@ -247,7 +247,7 @@ Feature: sharing
When user "Alice" shares folder "/PARENT" with group "grp1" using the sharing API
Then user "Brian" should have sync enabled for share "PARENT"
And user "Brian" should see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |


Scenario: sharing again an own file while belonging to a group
Expand Down Expand Up @@ -426,10 +426,10 @@ Feature: sharing
Then the OCS status code should be "<ocs-status-code>"
And the HTTP status code should be "200"
And user "Brian" should see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/PARENT/parent.txt |
And user "Carol" should see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/PARENT/parent.txt |
Examples:
| ocs-api-version | ocs-status-code |
Expand Down
106 changes: 53 additions & 53 deletions tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@ Feature: accept/decline shares coming from internal users
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "Brian" should see the following elements
| /FOLDER/ |
| /PARENT/ |
| /FOLDER |
| /PARENT |
| /textfile0.txt |
But user "Brian" should not see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/PARENT/parent.txt |
| /Shares/textfile0.txt |
And the sharing API should report to user "Brian" that these shares are in the pending state
| path |
| /PARENT/ |
| /textfile0.txt |
And user "Carol" should see the following elements
| /FOLDER/ |
| /PARENT/ |
| /FOLDER |
| /PARENT |
| /textfile0.txt |
But user "Carol" should not see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/PARENT/parent.txt |
| /Shares/textfile0.txt |
And the sharing API should report to user "Carol" that these shares are in the pending state
Expand All @@ -68,11 +68,11 @@ Feature: accept/decline shares coming from internal users
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "Brian" should see the following elements
| /FOLDER/ |
| /PARENT/ |
| /FOLDER |
| /PARENT |
| /textfile0.txt |
But user "Brian" should not see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/PARENT/parent.txt |
| /Shares/textfile0.txt |
And the sharing API should report to user "Brian" that these shares are in the pending state
Expand Down Expand Up @@ -120,10 +120,10 @@ Feature: accept/decline shares coming from internal users
| share_with_displayname | %displayname% |
| mail_send | 0 |
And user "Brian" should see the following elements
| /FOLDER/ |
| /PARENT/ |
| /FOLDER |
| /PARENT |
| /textfile0.txt |
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/PARENT/parent.txt |
| /Shares/textfile0.txt |
And the sharing API should report to user "Brian" that these shares are in the accepted state
Expand All @@ -145,7 +145,7 @@ Feature: accept/decline shares coming from internal users
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And user "Brian" should see the following elements
| /Shares/shared/ |
| /Shares/shared |
And the sharing API should report to user "Brian" that these shares are in the accepted state
| path |
| /Shares/shared/ |
Expand All @@ -170,11 +170,11 @@ Feature: accept/decline shares coming from internal users
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "Brian" should see the following elements
| /FOLDER/ |
| /PARENT/ |
| /FOLDER |
| /PARENT |
| /textfile0.txt |
But user "Brian" should not see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/PARENT/parent.txt |
| /Shares/textfile0.txt |
And the sharing API should report to user "Brian" that these shares are in the declined state
Expand Down Expand Up @@ -204,7 +204,7 @@ Feature: accept/decline shares coming from internal users
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "Brian" should not see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/PARENT/parent.txt |
| /Shares/textfile0.txt |
And the sharing API should report to user "Brian" that these shares are in the declined state
Expand Down Expand Up @@ -253,15 +253,15 @@ Feature: accept/decline shares coming from internal users
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "Carol" should not see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/PARENT/parent.txt |
| /Shares/textfile0.txt |
And the sharing API should report to user "Carol" that these shares are in the pending state
| path |
| /PARENT/ |
| /textfile0.txt |
But user "Brian" should see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/PARENT/parent.txt |
| /Shares/textfile0.txt |
And the sharing API should report to user "Brian" that these shares are in the accepted state
Expand Down Expand Up @@ -293,8 +293,8 @@ Feature: accept/decline shares coming from internal users
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "Carol" should see the following elements
| /Shares/shared/Brian/ |
| /Shares/shared (1)/Alice/ |
| /Shares/shared/Brian |
| /Shares/shared (1)/Alice |
And the sharing API should report to user "Carol" that these shares are in the accepted state
| path |
| /Shares/shared/ |
Expand Down Expand Up @@ -384,11 +384,11 @@ Feature: accept/decline shares coming from internal users
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "Brian" should see the following elements
| /FOLDER/ |
| /PARENT/ |
| /Shares/PARENT/ |
| /FOLDER |
| /PARENT |
| /Shares/PARENT |
| /Shares/PARENT/abc.txt |
| /Shares/FOLDER/ |
| /Shares/FOLDER |
| /Shares/FOLDER/abc.txt |
And user "Brian" should not see the following elements
| /FOLDER/abc.txt |
Expand All @@ -413,20 +413,20 @@ Feature: accept/decline shares coming from internal users
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "Brian" should see the following elements
| /FOLDER/ |
| /PARENT/ |
| /Shares/PARENT/ |
| /Shares/FOLDER/ |
| /FOLDER |
| /PARENT |
| /Shares/PARENT |
| /Shares/FOLDER |
| /Shares/PARENT/abc.txt |
| /Shares/FOLDER/abc.txt |
And user "Brian" should not see the following elements
| /FOLDER/abc.txt |
| /PARENT/abc.txt |
And user "Carol" should see the following elements
| /FOLDER/ |
| /PARENT/ |
| /Shares/PARENT/ |
| /Shares/FOLDER/ |
| /FOLDER |
| /PARENT |
| /Shares/PARENT |
| /Shares/FOLDER |
| /Shares/PARENT/abc.txt |
| /Shares/FOLDER/abc.txt |
And user "Carol" should not see the following elements
Expand Down Expand Up @@ -472,19 +472,19 @@ Feature: accept/decline shares coming from internal users
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "Brian" should see the following elements
| /PARENT/ |
| /PARENT |
| /textfile0.txt |
But user "Brian" should not see the following elements
| /Shares/textfile0.txt |
| /Shares/PARENT/ |
| /Shares/PARENT |
When user "Brian" accepts share "/textfile0.txt" offered by user "Alice" using the sharing API
And user "Brian" accepts share "/PARENT" offered by user "Alice" using the sharing API
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "Brian" should see the following elements
| /PARENT/ |
| /PARENT |
| /textfile0.txt |
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/textfile0.txt |


Expand Down Expand Up @@ -526,10 +526,10 @@ Feature: accept/decline shares coming from internal users
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "David" should see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/PARENT/abc.txt |
And user "David" should not see the following elements
| /PARENT (2)/ |
| /PARENT (2) |
And the content of file "/Shares/PARENT/abc.txt" for user "David" should be "uploaded content"

@issue-1123 @issue-2540
Expand Down Expand Up @@ -600,9 +600,9 @@ Feature: accept/decline shares coming from internal users
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "Brian" should see the following elements
| /PARENT/ |
| /Shares/PARENT/ |
| /Shares/PaRent/ |
| /PARENT |
| /Shares/PARENT |
| /Shares/PaRent |
| /Shares/PARENT.txt |
And the content of file "/Shares/PARENT/parent.txt" for user "Brian" should be "subfile, from alice to grp2"
And the content of file "/Shares/PaRent/parent.txt" for user "Brian" should be "subfile, from alice to grp2"
Expand All @@ -620,10 +620,10 @@ Feature: accept/decline shares coming from internal users
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "Brian" should see the following elements
| /PARENT/ |
| /Shares/PARENT/ |
| /Shares/PARENT (1)/ |
| /Shares/PaRent/ |
| /PARENT |
| /Shares/PARENT |
| /Shares/PARENT (1) |
| /Shares/PaRent |
| /Shares/PARENT.txt |
| /Shares/PARENT (1).txt |
| /Shares/parent.txt |
Expand Down Expand Up @@ -664,9 +664,9 @@ Feature: accept/decline shares coming from internal users
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "Carol" should see the following elements
| /PARENT/ |
| /Shares/PARENT/ |
| /Shares/PaRent/ |
| /PARENT |
| /Shares/PARENT |
| /Shares/PaRent |
| /Shares/PARENT.txt |
And the content of file "/Shares/PARENT/parent.txt" for user "Carol" should be "subfile, from alice to grp1"
And the content of file "/Shares/PARENT.txt" for user "Carol" should be "from alice to grp1"
Expand All @@ -683,10 +683,10 @@ Feature: accept/decline shares coming from internal users
Then the OCS status code of responses on all endpoints should be "100"
And the HTTP status code of responses on all endpoints should be "200"
And user "Carol" should see the following elements
| /PARENT/ |
| /Shares/PARENT/ |
| /Shares/PARENT (1)/ |
| /Shares/PaRent/ |
| /PARENT |
| /Shares/PARENT |
| /Shares/PARENT (1) |
| /Shares/PaRent |
| /Shares/PARENT.txt |
| /Shares/PARENT (1).txt |
| /Shares/parent.txt |
Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,10 @@ Feature: sharing
When the administrator removes user "Carol" from group "group0" using the provisioning API
Then the HTTP status code should be "204"
And user "Brian" should see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/PARENT/parent.txt |
But user "Carol" should not see the following elements
| /Shares/PARENT/ |
| /Shares/PARENT |
| /Shares/PARENT/parent.txt |

@smokeTest @issue-1226 @issue-1270 @issue-1271 @issue-1231
Expand Down
Loading

0 comments on commit a68e343

Please sign in to comment.