From 0c10ee4d2d3e44380073970d776e65b67d971488 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 21 Dec 2022 18:32:56 +0545 Subject: [PATCH] Adjust parameter name to theResponseShouldContain --- .../features/bootstrap/SpacesContext.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/acceptance/features/bootstrap/SpacesContext.php b/tests/acceptance/features/bootstrap/SpacesContext.php index 02ca076d5f..c0e7b23711 100644 --- a/tests/acceptance/features/bootstrap/SpacesContext.php +++ b/tests/acceptance/features/bootstrap/SpacesContext.php @@ -3001,14 +3001,14 @@ class SpacesContext implements Context { /** * @param string $method # method should be either PROPFIND or REPORT * @param string $user - * @param string $mountPoint # an entity inside a space, or the space itself + * @param string $spaceNameOrMountPoint # an entity inside a space, or the space name itself * @param TableNode $table * * @return void * @throws GuzzleException * @throws JsonException */ - public function theResponseShouldContain(string $method, string $user, string $mountPoint, TableNode $table): void { + public function theResponseShouldContain(string $method, string $user, string $spaceNameOrMountPoint, TableNode $table): void { $xmlRes = $this->featureContext->getResponseXml(); foreach ($table->getHash() as $row) { $findItem = $row['key']; @@ -3020,23 +3020,23 @@ class SpacesContext implements Context { $resourceType = $xmlRes->xpath("//d:response/d:propstat/d:prop/d:getcontenttype")[0]->__toString(); if ($method === 'PROPFIND') { if (!$resourceType) { - Assert::assertEquals($this->getFolderId($user, $mountPoint, $value), $responseValue, 'wrong fileId in the response'); + Assert::assertEquals($this->getFolderId($user, $spaceNameOrMountPoint, $value), $responseValue, 'wrong fileId in the response'); } else { - Assert::assertEquals($this->getFileId($user, $mountPoint, $value), $responseValue, 'wrong fileId in the response'); + Assert::assertEquals($this->getFileId($user, $spaceNameOrMountPoint, $value), $responseValue, 'wrong fileId in the response'); } } else { if ($resourceType === 'httpd/unix-directory') { - Assert::assertEquals($this->getFolderId($user, $mountPoint, $value), $responseValue, 'wrong fileId in the response'); + Assert::assertEquals($this->getFolderId($user, $spaceNameOrMountPoint, $value), $responseValue, 'wrong fileId in the response'); } else { - Assert::assertEquals($this->getFileId($user, $mountPoint, $value), $responseValue, 'wrong fileId in the response'); + Assert::assertEquals($this->getFileId($user, $spaceNameOrMountPoint, $value), $responseValue, 'wrong fileId in the response'); } } break; case "oc:file-parent": - Assert::assertEquals($this->getFolderId($user, $mountPoint, $value), $responseValue, 'wrong file-parentId in the response'); + Assert::assertEquals($this->getFolderId($user, $spaceNameOrMountPoint, $value), $responseValue, 'wrong file-parentId in the response'); break; case "oc:privatelink": - Assert::assertEquals($this->getPrivateLink($user, $mountPoint), $responseValue, 'cannot find private link for space or resource in the response'); + Assert::assertEquals($this->getPrivateLink($user, $spaceNameOrMountPoint), $responseValue, 'cannot find private link for space or resource in the response'); break; default: Assert::assertEquals($value, $responseValue, "wrong $findItem in the response");