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

test: rename PROPFIND response check steps

Browse Source 
test: fix tests
This commit is contained in:
Saw-jan
2024-10-02 13:33:33 +05:45
parent 08922584bc
commit 732f2b241e
15 changed files with 124 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/acceptance/bootstrap/FeatureContext.php
+20 -21
View File
@@ -145,8 +145,6 @@ class FeatureContext extends BehatVariablesContext {
* in the apiComments suite.
*/
private string $stepLineRef = '';
private bool $sendStepLineRef = false;
private bool $sendStepLineRefHasBeenChecked = false;
/**
* @var boolean true if TEST_SERVER_FED_URL is defined
@@ -416,17 +414,6 @@ class FeatureContext extends BehatVariablesContext {
return (\getenv("TEST_WITH_LDAP") === "true");
}
/**
* @return bool
*/
public function sendScenarioLineReferencesInXRequestId(): ?bool {
if ($this->sendStepLineRefHasBeenChecked === false) {
$this->sendStepLineRef = (\getenv("SEND_SCENARIO_LINE_REFERENCES") === "true");
$this->sendStepLineRefHasBeenChecked = true;
}
return $this->sendStepLineRef;
}
/**
* @return bool
*/
@@ -880,7 +867,7 @@ class FeatureContext extends BehatVariablesContext {
* @return string
*/
public function getStepLineRef(): string {
if (!$this->sendStepLineRef) {
if (!HttpRequestHelper::sendScenarioLineReferencesInXRequestId()) {
return '';
}
@@ -2435,6 +2422,14 @@ class FeatureContext extends BehatVariablesContext {
"getUUIDv4Regex"
],
"parameter" => []
],
[
"code" => "%request_id_pattern%",
"function" => [
__NAMESPACE__ . '\TestHelpers\HttpRequestHelper',
"getXRequestIdRegex"
],
"parameter" => []
]
];
if ($user !== null) {
@@ -2522,11 +2517,15 @@ class FeatureContext extends BehatVariablesContext {
$substitution["function"],
$substitution["parameter"]
);
foreach ($functions as $function => $parameters) {
$replacement = \call_user_func_array(
$function,
\array_merge([$replacement], $parameters)
);
// do not run functions on regex patterns
if (!\str_ends_with($value, "_pattern%")) {
foreach ($functions as $function => $parameters) {
$replacement = \call_user_func_array(
$function,
\array_merge([$replacement], $parameters)
);
}
}
$value = \str_replace(
$substitution["code"],
@@ -2644,7 +2643,7 @@ class FeatureContext extends BehatVariablesContext {
$environment->registerContext($this->spacesContext);
}
if ($this->sendScenarioLineReferencesInXRequestId()) {
if (HttpRequestHelper::sendScenarioLineReferencesInXRequestId()) {
$this->scenarioString = $suiteName . '/' . $featureFileName . ':' . $scenarioLine;
} else {
$this->scenarioString = '';
@@ -2678,7 +2677,7 @@ class FeatureContext extends BehatVariablesContext {
* @return void
*/
public function beforeEachStep(BeforeStepScope $scope): void {
if ($this->sendScenarioLineReferencesInXRequestId()) {
if (HttpRequestHelper::sendScenarioLineReferencesInXRequestId()) {
$this->stepLineRef = $this->scenarioString . '-' . $scope->getStep()->getLine();
} else {
$this->stepLineRef = '';
tests/acceptance/bootstrap/SpacesContext.php
+18 -18
View File
@@ -3775,7 +3775,7 @@ class SpacesContext implements Context {
if ($resource === '' || $resource === '/') {
$resource = $spaceName;
} else {
$resource = $spaceName . '/' . $resource;
$resource = "$spaceName/$resource";
}
}
@@ -3795,44 +3795,44 @@ class SpacesContext implements Context {
}
/**
* @Then /^as user "([^"]*)" the (PROPFIND|REPORT) response should contain a (mountpoint|space) "([^"]*)" with these key and value pairs:$/
* @Then /^as user "([^"]*)" the (PROPFIND|REPORT) response should contain a (resource|space) "([^"]*)" with these key and value pairs:$/
*
* @param string $user
* @param string $method # method should be either PROPFIND or REPORT
* @param string $type # type should be either mountpoint or space
* @param string $mountPoint
* @param string $type # type should be either resource or space
* @param string $resource
* @param TableNode $table
*
* @return void
* @throws GuzzleException
* @throws JsonException
*/
public function asUsertheXMLResponseShouldContainMountpointWithTheseKeyAndValuePair(string $user, string $method, string $type, string $mountPoint, TableNode $table): void {
public function asUsertheXMLResponseShouldContainMountpointWithTheseKeyAndValuePair(string $user, string $method, string $type, string $resource, TableNode $table): void {
$this->featureContext->verifyTableNodeColumns($table, ['key', 'value']);
if ($this->featureContext->getDavPathVersion() === WebDavHelper::DAV_VERSION_SPACES && $type === 'space') {
$space = $this->getSpaceByName($user, $mountPoint);
$mountPoint = $space['id'];
$space = $this->getSpaceByName($user, $resource);
$resource = $space['id'];
} else {
$mountPoint = \rawurlencode($mountPoint);
$resource = \rawurlencode($resource);
}
$this->theXMLResponseShouldContain($mountPoint, $table);
$this->theXMLResponseShouldContain($resource, $table);
}
/**
* @param string $spaceNameOrMountPoint # an entity inside a space, or the space name itself
* @param string $resource
* @param TableNode $table
*
* @return void
* @throws GuzzleException
* @throws JsonException
*/
public function theXMLResponseShouldContain(string $spaceNameOrMountPoint, TableNode $table): void {
public function theXMLResponseShouldContain(string $resource, TableNode $table): void {
$xmlResponse = $this->featureContext->getResponseXml();
$hrefs = array_map(fn($href) => $href->__toString(), $xmlResponse->xpath("//d:response/d:href"));
$hrefs = array_map(fn ($href) => $href->__toString(), $xmlResponse->xpath("//d:response/d:href"));
$currentHref = '';
foreach ($hrefs as $href) {
if (\str_ends_with(\rtrim($href, "/"), "/$spaceNameOrMountPoint")) {
if (\str_ends_with(\rtrim($href, "/"), "/$resource")) {
$currentHref = $href;
break;
}
@@ -3851,15 +3851,15 @@ class SpacesContext implements Context {
switch ($itemToFind) {
case "oc:fileid":
$expectedValue = GraphHelper::sanitizeRegexPattern($expectedValue);
$expectedValue = GraphHelper::jsonSchemaRegexToPureRegex($expectedValue);
Assert::assertRegExp($expectedValue, $actualValue, 'wrong "fileid" in the response');
break;
case "oc:file-parent":
$expectedValue = GraphHelper::sanitizeRegexPattern($expectedValue);
$expectedValue = GraphHelper::jsonSchemaRegexToPureRegex($expectedValue);
Assert::assertRegExp($expectedValue, $actualValue, 'wrong "file-parent" in the response');
break;
case "oc:privatelink":
$expectedValue = GraphHelper::sanitizeRegexPattern($expectedValue);
$expectedValue = GraphHelper::jsonSchemaRegexToPureRegex($expectedValue);
Assert::assertRegExp($expectedValue, $actualValue, 'wrong "privatelink" in the response');
break;
case "oc:tags":
@@ -3871,7 +3871,7 @@ class SpacesContext implements Context {
$actualTags = \explode(",", $actualValue);
\sort($actualTags);
$actualTags = \implode(",", $actualValue);
$actualTags = \implode(",", $actualTags);
Assert::assertEquals($expectedTags, $actualTags, "wrong '$itemToFind' in the response");
break;
case "d:lockdiscovery/d:activelock/d:timeout":
@@ -3887,7 +3887,7 @@ class SpacesContext implements Context {
}
break;
case "oc:remote-item-id":
$expectedValue = GraphHelper::sanitizeRegexPattern($expectedValue);
$expectedValue = GraphHelper::jsonSchemaRegexToPureRegex($expectedValue);
Assert::assertRegExp($expectedValue, $actualValue, 'wrong "remote-item-id" in the response');
break;
default: