sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: fix request to another user tests

Browse Source
This commit is contained in:
Saw-jan
2024-12-09 14:52:23 +05:45
parent 5d42d8ee0f
commit 4bdad9121f
2 changed files with 16 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/acceptance/TestHelpers/WebDavHelper.php
+12 -55
View File
@@ -572,53 +572,16 @@ class WebDavHelper {
$user, $user,
$password $password
); );
// we expect to get a multipart XML response with status 207 Assert::assertEquals(207, $response->getStatusCode(), "PROPFIND for user '$user' failed so the personal space id cannot be discovered");
$status = $response->getStatusCode();
if ($status === 401) {
throw new SpaceNotFoundException(__METHOD__ . " Personal space not found for user " . $user);
} elseif ($status !== 207) {
throw new Exception(
__METHOD__ . " webdav propfind for user $user failed with status $status - so the personal space id cannot be discovered"
);
}
$responseXmlObject = HttpRequestHelper::getResponseXml( $responseXmlObject = HttpRequestHelper::getResponseXml(
$response, $response,
__METHOD__ __METHOD__
); );
$xmlPart = $responseXmlObject->xpath("/d:multistatus/d:response[1]/d:propstat/d:prop/oc:id"); $xmlPart = $responseXmlObject->xpath("/d:multistatus/d:response[1]/d:propstat/d:prop/oc:spaceid");
if ($xmlPart === false) { Assert::assertNotEmpty($xmlPart, "The 'oc:spaceid' for user '$user' was not found in the PROPFIND response");
throw new Exception(
__METHOD__ . " oc:id not found in webdav propfind for user $user - so the personal space id cannot be discovered" $personalSpaceId = $xmlPart[0]->__toString();
);
}
$ocIdRawString = $xmlPart[0]->__toString();
$separator = "!";
if (\strpos($ocIdRawString, $separator) !== false) {
// The string is not base64-encoded, because the exclamation mark is not in the base64 alphabet.
// We expect to have a string with 2 parts separated by the exclamation mark.
// This is the format introduced in 2022-02
// oc:id should be something like:
// "7464caf6-1799-103c-9046-c7b74deb5f63!7464caf6-1799-103c-9046-c7b74deb5f63"
// There is no encoding to decode.
$decodedId = $ocIdRawString;
} else {
// fall-back to assuming that the oc:id is base64-encoded
// That is the format used before and up to 2022-02
// This can be removed after both the edge and master branches of cs3org/reva are using the new format.
// oc:id should be some base64 encoded string like:
// "NzQ2NGNhZjYtMTc5OS0xMDNjLTkwNDYtYzdiNzRkZWI1ZjYzOjc0NjRjYWY2LTE3OTktMTAzYy05MDQ2LWM3Yjc0ZGViNWY2Mw=="
// That should decode to something like:
// "7464caf6-1799-103c-9046-c7b74deb5f63:7464caf6-1799-103c-9046-c7b74deb5f63"
$decodedId = base64_decode($ocIdRawString);
$separator = ":";
}
$ocIdParts = \explode($separator, $decodedId);
if (\count($ocIdParts) !== 2) {
throw new Exception(
__METHOD__ . " the oc:id $decodedId for user $user does not have 2 parts separated by '$separator', so the personal space id cannot be discovered"
);
}
$personalSpaceId = $ocIdParts[0];
} else { } else {
foreach ($json->value as $spaces) { foreach ($json->value as $spaces) {
if ($spaces->driveType === "personal") { if ($spaces->driveType === "personal") {
@@ -627,18 +590,12 @@ class WebDavHelper {
} }
} }
} }
if ($personalSpaceId) {
// If env var LOG_PERSONAL_SPACE_ID is defined, then output the details of the personal space id. Assert::assertNotEmpty($personalSpaceId, "The personal space id for user '$user' was not found");
// This is a useful debugging tool to have confidence that the personal space id is found correctly.
if (\getenv('LOG_PERSONAL_SPACE_ID') !== false) { self::$spacesIdRef[$user] = [];
echo __METHOD__ . " personal space id of user $user is $personalSpaceId\n"; self::$spacesIdRef[$user]["personal"] = $personalSpaceId;
} return $personalSpaceId;
self::$spacesIdRef[$user] = [];
self::$spacesIdRef[$user]["personal"] = $personalSpaceId;
return $personalSpaceId;
} else {
throw new SpaceNotFoundException(__METHOD__ . " Personal space not found for user " . $user);
}
} }
/** /**
tests/acceptance/bootstrap/AuthContext.php
+4 -5
View File
@@ -24,7 +24,6 @@ use Behat\Gherkin\Node\TableNode;
use Behat\Behat\Context\Context; use Behat\Behat\Context\Context;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use TestHelpers\HttpRequestHelper; use TestHelpers\HttpRequestHelper;
use TestHelpers\SetupHelper;
use TestHelpers\BehatHelper; use TestHelpers\BehatHelper;
use TestHelpers\WebDavHelper; use TestHelpers\WebDavHelper;
@@ -596,12 +595,12 @@ class AuthContext implements Context {
$headers = []; $headers = [];
if ($method === 'MOVE' || $method === 'COPY') { if ($method === 'MOVE' || $method === 'COPY') {
$baseUrl = $this->featureContext->getBaseUrl(); $baseUrl = $this->featureContext->getBaseUrl();
$suffix = ""; $suffix = $user;
if ($this->featureContext->getDavPathVersion() === WebDavHelper::DAV_VERSION_SPACES) { if ($this->featureContext->getDavPathVersion() === WebDavHelper::DAV_VERSION_SPACES) {
$suffix = $this->featureContext->spacesContext->getSpaceIdByName($user, "Personal"); $suffix = $this->featureContext->getPersonalSpaceIdForUser($user);
} }
$davPath = WebDavHelper::getDavPath($this->featureContext->getDavPathVersion(), $user); $davPath = WebDavHelper::getDavPath($this->featureContext->getDavPathVersion(), $suffix);
$headers['Destination'] = "$baseUrl/$davPath/$suffix/moved"; $headers['Destination'] = "$baseUrl/$davPath/moved";
} }
foreach ($table->getHash() as $row) { foreach ($table->getHash() as $row) {