From 620b44c90ad91a963051a2ac5e045eeeaca0a958 Mon Sep 17 00:00:00 2001 From: Prajwol Amatya <83579989+PrajwolAmatya@users.noreply.github.com> Date: Thu, 7 Sep 2023 10:33:44 +0545 Subject: [PATCH] send X-Request-Id in header of every request (#7238) --- tests/TestHelpers/EmailHelper.php | 2 +- tests/TestHelpers/GraphHelper.php | 6 +- tests/TestHelpers/WebDavHelper.php | 1 - .../features/apiContract/copy.feature | 6 +- .../features/apiContract/propfind.feature | 4 +- .../features/apiContract/sharesReport.feature | 6 +- .../features/apiContract/spacesReport.feature | 9 ++- .../apiContract/spacesSharesReport.feature | 6 +- .../features/bootstrap/ArchiverContext.php | 4 +- .../bootstrap/NotificationContext.php | 8 +- .../features/bootstrap/SearchContext.php | 3 +- .../features/bootstrap/SettingsContext.php | 12 +-- .../features/bootstrap/SpacesContext.php | 80 +++++++++++-------- .../features/bootstrap/TagContext.php | 3 +- .../bootstrap/WebDavLockingContext.php | 1 + 15 files changed, 86 insertions(+), 65 deletions(-) diff --git a/tests/TestHelpers/EmailHelper.php b/tests/TestHelpers/EmailHelper.php index 6f3e8a871f..02ffe4f758 100644 --- a/tests/TestHelpers/EmailHelper.php +++ b/tests/TestHelpers/EmailHelper.php @@ -133,7 +133,7 @@ class EmailHelper { $endTime = $currentTime + $waitTimeSec; $mailBox = self::getMailBoxFromEmail($emailAddress); while ($currentTime <= $endTime) { - $mailboxResponse = self::getMailboxInformation($mailBox); + $mailboxResponse = self::getMailboxInformation($mailBox, $xRequestId); if (!empty($mailboxResponse) && \sizeof($mailboxResponse) >= $emailNumber) { $mailboxId = $mailboxResponse[\sizeof($mailboxResponse) - $emailNumber]->id; $response = self::getBodyOfAnEmailById($mailBox, $mailboxId, $xRequestId); diff --git a/tests/TestHelpers/GraphHelper.php b/tests/TestHelpers/GraphHelper.php index 67d38e51b5..1db5b52972 100644 --- a/tests/TestHelpers/GraphHelper.php +++ b/tests/TestHelpers/GraphHelper.php @@ -992,6 +992,7 @@ class GraphHelper { * @param string $user * @param string $password * @param string $spaceId + * @param string $xRequestId * * @return ResponseInterface * @throws GuzzleException @@ -1000,13 +1001,14 @@ class GraphHelper { string $baseUrl, string $user, string $password, - string $spaceId + string $spaceId, + string $xRequestId ): ResponseInterface { $url = self::getFullUrl($baseUrl, 'drives/' . $spaceId); $header = ["restore" => true]; $body = '{}'; - return HttpRequestHelper::sendRequest($url, '', 'PATCH', $user, $password, $header, $body); + return HttpRequestHelper::sendRequest($url, $xRequestId, 'PATCH', $user, $password, $header, $body); } /** diff --git a/tests/TestHelpers/WebDavHelper.php b/tests/TestHelpers/WebDavHelper.php index 8d27d4147e..13cfb816ca 100644 --- a/tests/TestHelpers/WebDavHelper.php +++ b/tests/TestHelpers/WebDavHelper.php @@ -202,7 +202,6 @@ class WebDavHelper { throw new InvalidArgumentException('Invalid depth value ' . $folderDepth); } $headers['Depth'] = $folderDepth; - $headers['X-Request-Id'] = WebDavHelper::generateUUIDv4(); return self::makeDavRequest( $baseUrl, $user, diff --git a/tests/acceptance/features/apiContract/copy.feature b/tests/acceptance/features/apiContract/copy.feature index 99bf3858e2..6dc8e74fae 100644 --- a/tests/acceptance/features/apiContract/copy.feature +++ b/tests/acceptance/features/apiContract/copy.feature @@ -19,7 +19,7 @@ Feature: Copy test When user "Alice" copies file "testfile.txt" from space "new-space" to "/new/testfile.txt" inside space "new-space" using the WebDAV API Then the HTTP status code should be "201" And the following headers should match these regular expressions - | Oc-Fileid | /^[a-f0-9!\$\-]{110}$/ | - | Access-Control-Allow-Origin | /^[*]{1}$/ | - | X-Request-Id | /^[a-f0-9!\-]{36}$/ | + | Oc-Fileid | /^[a-f0-9!\$\-]{110}$/ | + | Access-Control-Allow-Origin | /^[*]{1}$/ | + | X-Request-Id | /^[a-zA-Z]+\/[a-zA-Z]+\.feature:\d+(-\d+)?$/ | diff --git a/tests/acceptance/features/apiContract/propfind.feature b/tests/acceptance/features/apiContract/propfind.feature index ebd028d177..5e6051c421 100644 --- a/tests/acceptance/features/apiContract/propfind.feature +++ b/tests/acceptance/features/apiContract/propfind.feature @@ -18,7 +18,7 @@ Feature: Propfind test When user "Alice" sends PROPFIND request to space "new-space" using the WebDAV API Then the HTTP status code should be "207" And the following headers should match these regular expressions - | X-Request-Id | /^[a-f0-9!\-]{36}$/ | + | X-Request-Id | /^[a-zA-Z]+\/[a-zA-Z]+\.feature:\d+(-\d+)?$/ | And the "PROPFIND" response should contain a space "new-space" with these key and value pairs: | key | value | | oc:fileid | UUIDof:new-space | @@ -36,7 +36,7 @@ Feature: Propfind test When user "Brian" sends PROPFIND request to space "new-space" using the WebDAV API Then the HTTP status code should be "207" And the following headers should match these regular expressions - | X-Request-Id | /^[a-f0-9!\-]{36}$/ | + | X-Request-Id | /^[a-zA-Z]+\/[a-zA-Z]+\.feature:\d+(-\d+)?$/ | And the "PROPFIND" response should contain a space "new-space" with these key and value pairs: | key | value | | oc:fileid | UUIDof:new-space | diff --git a/tests/acceptance/features/apiContract/sharesReport.feature b/tests/acceptance/features/apiContract/sharesReport.feature index 8a8a675b2a..834f9b145a 100644 --- a/tests/acceptance/features/apiContract/sharesReport.feature +++ b/tests/acceptance/features/apiContract/sharesReport.feature @@ -20,7 +20,7 @@ Feature: REPORT request to Shares space When user "Brian" searches for "SubFolder1" using the WebDAV API Then the HTTP status code should be "207" And the following headers should match these regular expressions - | X-Request-Id | /^[a-f0-9!\-]{36}$/ | + | X-Request-Id | /^[a-zA-Z]+\/[a-zA-Z]+\.feature:\d+(-\d+)?$/ | And the "REPORT" response to user "Brian" should contain a mountpoint "folderMain" with these key and value pairs: | key | value | | oc:fileid | UUIDof:SubFolder1 | @@ -42,7 +42,7 @@ Feature: REPORT request to Shares space When user "Brian" searches for "frodo.txt" using the WebDAV API Then the HTTP status code should be "207" And the following headers should match these regular expressions - | X-Request-Id | /^[a-f0-9!\-]{36}$/ | + | X-Request-Id | /^[a-zA-Z]+\/[a-zA-Z]+\.feature:\d+(-\d+)?$/ | And the "REPORT" response to user "Brian" should contain a mountpoint "folderMain" with these key and value pairs: | key | value | | oc:fileid | UUIDof:SubFolder1/subFOLDER2/frodo.txt | @@ -63,7 +63,7 @@ Feature: REPORT request to Shares space When user "Brian" searches for "folderMain" using the WebDAV API Then the HTTP status code should be "207" And the following headers should match these regular expressions - | X-Request-Id | /^[a-f0-9!\-]{36}$/ | + | X-Request-Id | /^[a-zA-Z]+\/[a-zA-Z]+\.feature:\d+(-\d+)?$/ | And the search result should contain "0" entries Examples: | dav-path-version | diff --git a/tests/acceptance/features/apiContract/spacesReport.feature b/tests/acceptance/features/apiContract/spacesReport.feature index 9333ee09ca..92cd48e847 100644 --- a/tests/acceptance/features/apiContract/spacesReport.feature +++ b/tests/acceptance/features/apiContract/spacesReport.feature @@ -21,7 +21,7 @@ Feature: REPORT request to project space And the search result of user "Alice" should contain only these entries: | /testFile.txt | And the following headers should match these regular expressions - | X-Request-Id | /^[a-f0-9!\-]{36}$/ | + | X-Request-Id | /^[a-zA-Z]+\/[a-zA-Z]+\.feature:\d+(-\d+)?$/ | And the "REPORT" response to user "Alice" should contain a mountpoint "findData" with these key and value pairs: | key | value | | oc:fileid | UUIDof:testFile.txt | @@ -41,7 +41,7 @@ Feature: REPORT request to project space And the search result of user "Alice" should contain only these entries: | /folderMain/SubFolder1/subFOLDER2/insideTheFolder.txt | And the following headers should match these regular expressions - | X-Request-Id | /^[a-f0-9!\-]{36}$/ | + | X-Request-Id | /^[a-zA-Z]+\/[a-zA-Z]+\.feature:\d+(-\d+)?$/ | And the "REPORT" response to user "Alice" should contain a mountpoint "findData" with these key and value pairs: | key | value | | oc:fileid | UUIDof:folderMain/SubFolder1/subFOLDER2/insideTheFolder.txt | @@ -60,7 +60,7 @@ Feature: REPORT request to project space And the search result of user "Alice" should contain only these entries: | /folderMain | And the following headers should match these regular expressions - | X-Request-Id | /^[a-f0-9!\-]{36}$/ | + | X-Request-Id | /^[a-zA-Z]+\/[a-zA-Z]+\.feature:\d+(-\d+)?$/ | And the "REPORT" response to user "Alice" should contain a mountpoint "findData" with these key and value pairs: | key | value | | oc:fileid | UUIDof:folderMain | @@ -79,7 +79,8 @@ Feature: REPORT request to project space And the search result of user "Alice" should contain only these entries: | /folderMain/sub-folder | And the following headers should match these regular expressions - | X-Request-Id | /^[a-f0-9!\-]{36}$/ | + | X-Request-Id | /^[a-zA-Z]+\/[a-zA-Z]+\.feature:\d+(-\d+)?$/ | + Then the HTTP status code should be "207" And the "REPORT" response to user "Alice" should contain a mountpoint "findData" with these key and value pairs: | key | value | | oc:fileid | UUIDof:folderMain/sub-folder | diff --git a/tests/acceptance/features/apiContract/spacesSharesReport.feature b/tests/acceptance/features/apiContract/spacesSharesReport.feature index 81335a4169..bcf74b32d7 100644 --- a/tests/acceptance/features/apiContract/spacesSharesReport.feature +++ b/tests/acceptance/features/apiContract/spacesSharesReport.feature @@ -28,7 +28,7 @@ Feature: Report test When user "Brian" searches for "SubFolder1" using the WebDAV API Then the HTTP status code should be "207" And the following headers should match these regular expressions - | X-Request-Id | /^[a-f0-9!\-]{36}$/ | + | X-Request-Id | /^[a-zA-Z]+\/[a-zA-Z]+\.feature:\d+(-\d+)?$/ | And the "REPORT" response to user "Brian" should contain a mountpoint "folderMain" with these key and value pairs: | key | value | | oc:fileid | UUIDof:SubFolder1 | @@ -49,7 +49,7 @@ Feature: Report test When user "Brian" searches for "insideTheFolder.txt" using the WebDAV API Then the HTTP status code should be "207" And the following headers should match these regular expressions - | X-Request-Id | /^[a-f0-9!\-]{36}$/ | + | X-Request-Id | /^[a-zA-Z]+\/[a-zA-Z]+\.feature:\d+(-\d+)?$/ | And the "REPORT" response to user "Brian" should contain a mountpoint "folderMain" with these key and value pairs: | key | value | | oc:fileid | UUIDof:SubFolder1/subFOLDER2/insideTheFolder.txt | @@ -69,5 +69,5 @@ Feature: Report test When user "Brian" searches for "folderMain" using the WebDAV API Then the HTTP status code should be "207" And the following headers should match these regular expressions - | X-Request-Id | /^[a-f0-9!\-]{36}$/ | + | X-Request-Id | /^[a-zA-Z]+\/[a-zA-Z]+\.feature:\d+(-\d+)?$/ | And the search result should contain "0" entries diff --git a/tests/acceptance/features/bootstrap/ArchiverContext.php b/tests/acceptance/features/bootstrap/ArchiverContext.php index 8c854bf7a5..cb1a0897b1 100644 --- a/tests/acceptance/features/bootstrap/ArchiverContext.php +++ b/tests/acceptance/features/bootstrap/ArchiverContext.php @@ -166,7 +166,7 @@ class ArchiverContext implements Context { $queryString = $this->getArchiverQueryString($owner, $resource, $addressType); return HttpRequestHelper::get( $this->featureContext->getBaseUrl() . '/archiver?' . $queryString, - '', + $this->featureContext->getStepLineRef(), $downloader, $this->featureContext->getPasswordForUser($downloader), $headers @@ -199,7 +199,7 @@ class ArchiverContext implements Context { $this->featureContext->setResponse( HttpRequestHelper::get( $this->featureContext->getBaseUrl() . '/archiver?' . $queryString, - '', + $this->featureContext->getStepLineRef(), $user, $this->featureContext->getPasswordForUser($user), ) diff --git a/tests/acceptance/features/bootstrap/NotificationContext.php b/tests/acceptance/features/bootstrap/NotificationContext.php index f4db55fe6c..e6b62b6436 100644 --- a/tests/acceptance/features/bootstrap/NotificationContext.php +++ b/tests/acceptance/features/bootstrap/NotificationContext.php @@ -432,7 +432,9 @@ class NotificationContext implements Context { GraphHelper::getMySpaces( $this->featureContext->getBaseUrl(), $user, - $this->featureContext->getPasswordForUser($user) + $this->featureContext->getPasswordForUser($user), + '', + $this->featureContext->getStepLineRef() ) ); $expectedEmailBodyContent = $this->featureContext->substituteInLineCodes( @@ -541,7 +543,7 @@ class NotificationContext implements Context { $user ? $this->featureContext->getPasswordForUser($user) : $this->featureContext->getAdminPassword(), 'POST', $this->globalNotificationEndpointPath, - '', + $this->featureContext->getStepLineRef(), json_encode($payload), 2 ); @@ -608,7 +610,7 @@ class NotificationContext implements Context { $user ? $this->featureContext->getPasswordForUser($user) : $this->featureContext->getAdminPassword(), 'DELETE', $this->globalNotificationEndpointPath, - '', + $this->featureContext->getStepLineRef(), json_encode($payload), 2 ); diff --git a/tests/acceptance/features/bootstrap/SearchContext.php b/tests/acceptance/features/bootstrap/SearchContext.php index f67a1d894d..ceed909c36 100644 --- a/tests/acceptance/features/bootstrap/SearchContext.php +++ b/tests/acceptance/features/bootstrap/SearchContext.php @@ -64,7 +64,6 @@ class SearchContext implements Context { $user = $this->featureContext->getActualUsername($user); $baseUrl = $this->featureContext->getBaseUrl(); $password = $this->featureContext->getPasswordForUser($user); - $headers['X-Request-Id'] = WebDavHelper::generateUUIDv4(); $body = "\n" . " \n" . @@ -103,7 +102,7 @@ class SearchContext implements Context { $password, "REPORT", "/", - $headers, + null, $this->featureContext->getStepLineRef(), $body, $this->featureContext->getDavPathVersion() diff --git a/tests/acceptance/features/bootstrap/SettingsContext.php b/tests/acceptance/features/bootstrap/SettingsContext.php index 540f2a5254..01c847166b 100644 --- a/tests/acceptance/features/bootstrap/SettingsContext.php +++ b/tests/acceptance/features/bootstrap/SettingsContext.php @@ -58,7 +58,7 @@ class SettingsContext implements Context { public function getAllExistingRoles(string $user): void { $fullUrl = $this->baseUrl . $this->settingsUrl . "roles-list"; $this->featureContext->setResponse( - $this->spacesContext->sendPostRequestToUrl($fullUrl, $user, $this->featureContext->getPasswordForUser($user), "{}") + $this->spacesContext->sendPostRequestToUrl($fullUrl, $user, $this->featureContext->getPasswordForUser($user), "{}", $this->featureContext->getStepLineRef()) ); } @@ -77,7 +77,7 @@ class SettingsContext implements Context { $body = json_encode(["account_uuid" => $userId, "role_id" => $roleId], JSON_THROW_ON_ERROR); $this->featureContext->setResponse( - $this->spacesContext->sendPostRequestToUrl($fullUrl, $user, $this->featureContext->getPasswordForUser($user), $body) + $this->spacesContext->sendPostRequestToUrl($fullUrl, $user, $this->featureContext->getPasswordForUser($user), $body, $this->featureContext->getStepLineRef()) ); } @@ -93,7 +93,7 @@ class SettingsContext implements Context { public function sendRequestAssignmentsList(string $user, string $userId): ResponseInterface { $fullUrl = $this->baseUrl . $this->settingsUrl . "assignments-list"; $body = json_encode(["account_uuid" => $userId], JSON_THROW_ON_ERROR); - return $this->spacesContext->sendPostRequestToUrl($fullUrl, $user, $this->featureContext->getPasswordForUser($user), $body); + return $this->spacesContext->sendPostRequestToUrl($fullUrl, $user, $this->featureContext->getPasswordForUser($user), $body, $this->featureContext->getStepLineRef()); } /** @@ -271,7 +271,7 @@ class SettingsContext implements Context { public function sendRequestGetBundlesList(string $user): void { $fullUrl = $this->baseUrl . $this->settingsUrl . "bundles-list"; $this->featureContext->setResponse( - $this->spacesContext->sendPostRequestToUrl($fullUrl, $user, $this->featureContext->getPasswordForUser($user), '{}') + $this->spacesContext->sendPostRequestToUrl($fullUrl, $user, $this->featureContext->getPasswordForUser($user), '{}', $this->featureContext->getStepLineRef()) ); $this->featureContext->theHTTPStatusCodeShouldBe( @@ -312,7 +312,7 @@ class SettingsContext implements Context { $fullUrl = $this->baseUrl . $this->settingsUrl . "values-list"; $body = json_encode(["account_uuid" => "me"], JSON_THROW_ON_ERROR); $this->featureContext->setResponse( - $this->spacesContext->sendPostRequestToUrl($fullUrl, $user, $this->featureContext->getPasswordForUser($user), $body) + $this->spacesContext->sendPostRequestToUrl($fullUrl, $user, $this->featureContext->getPasswordForUser($user), $body, $this->featureContext->getStepLineRef()) ); Assert::assertEquals( @@ -392,7 +392,7 @@ class SettingsContext implements Context { ); $this->featureContext->setResponse( - $this->spacesContext->sendPostRequestToUrl($fullUrl, $user, $this->featureContext->getPasswordForUser($user), $body) + $this->spacesContext->sendPostRequestToUrl($fullUrl, $user, $this->featureContext->getPasswordForUser($user), $body, $this->featureContext->getStepLineRef()) ); } diff --git a/tests/acceptance/features/bootstrap/SpacesContext.php b/tests/acceptance/features/bootstrap/SpacesContext.php index 1f22153c58..cc34c07e68 100644 --- a/tests/acceptance/features/bootstrap/SpacesContext.php +++ b/tests/acceptance/features/bootstrap/SpacesContext.php @@ -272,7 +272,7 @@ class SpacesContext implements Context { return HttpRequestHelper::get( $fullUrl, - "", + $this->featureContext->getStepLineRef(), $user, $this->featureContext->getPasswordForUser($user), [], @@ -341,7 +341,7 @@ class SpacesContext implements Context { $this->featureContext->getPasswordForUser($user), "", ['oc:privatelink'], - "", + $this->featureContext->getStepLineRef(), "0", "files", WebDavHelper::DAV_VERSION_SPACES @@ -437,14 +437,16 @@ class SpacesContext implements Context { $this->featureContext->getBaseUrl(), $userAdmin, $this->featureContext->getPasswordForUser($userAdmin), - $value["id"] + $value["id"], + $this->featureContext->getStepLineRef() ); } GraphHelper::deleteSpace( $this->featureContext->getBaseUrl(), $userAdmin, $this->featureContext->getPasswordForUser($userAdmin), - $value["id"] + $value["id"], + $this->featureContext->getStepLineRef() ); } } @@ -517,7 +519,8 @@ class SpacesContext implements Context { $this->featureContext->getBaseUrl(), $user, $this->featureContext->getPasswordForUser($user), - "?" . $query + "?" . $query, + $this->featureContext->getStepLineRef() ) ); $this->rememberTheAvailableSpaces(); @@ -544,7 +547,8 @@ class SpacesContext implements Context { $this->featureContext->getBaseUrl(), $user, $this->featureContext->getPasswordForUser($user), - "?" . $query + "?" . $query, + $this->featureContext->getStepLineRef() ) ); $this->rememberTheAvailableSpaces(); @@ -571,7 +575,9 @@ class SpacesContext implements Context { $this->featureContext->getBaseUrl(), $user, $this->featureContext->getPasswordForUser($user), - $space["id"] + $space["id"], + '', + $this->featureContext->getStepLineRef() ) ); } @@ -603,7 +609,8 @@ class SpacesContext implements Context { $this->featureContext->getBaseUrl(), $user, $this->featureContext->getPasswordForUser($user), - $body + $body, + $this->featureContext->getStepLineRef() ) ); $this->setSpaceCreator($spaceName, $user); @@ -659,7 +666,7 @@ class SpacesContext implements Context { $this->featureContext->getPasswordForUser($user), $foldersPath, [], - '', + $this->featureContext->getStepLineRef(), 'infinity', 'files', WebDavHelper::DAV_VERSION_SPACES @@ -686,7 +693,7 @@ class SpacesContext implements Context { $this->featureContext->setResponse( HttpRequestHelper::sendRequest( $url, - "", + $this->featureContext->getStepLineRef(), "PATCH", $this->featureContext->getActualUsername($user), $this->featureContext->getPasswordForUser($user), @@ -1251,7 +1258,8 @@ class SpacesContext implements Context { $user, $this->featureContext->getPasswordForUser($user), $body, - $spaceId + $spaceId, + $this->featureContext->getStepLineRef() ); } @@ -1408,7 +1416,8 @@ class SpacesContext implements Context { $user, $this->featureContext->getPasswordForUser($user), $body, - $spaceId + $spaceId, + $this->featureContext->getStepLineRef() ) ); } @@ -1505,7 +1514,8 @@ class SpacesContext implements Context { $this->featureContext->getBaseUrl(), $user, $this->featureContext->getPasswordForUser($user), - $body + $body, + $this->featureContext->getStepLineRef() ); } @@ -1641,7 +1651,6 @@ class SpacesContext implements Context { ):void { $space = $this->getSpaceByName($user, $fromSpaceName); $headers['Destination'] = $this->destinationHeaderValueWithSpaceName($user, $fileDestination, $toSpaceName); - $headers['X-Request-Id'] = WebDavHelper::generateUUIDv4(); $fullUrl = $space["root"]["webDavUrl"] . '/' . ltrim($fileSource, "/"); $this->featureContext->setResponse($this->copyFilesAndFoldersRequest($user, $fullUrl, $headers)); } @@ -1853,7 +1862,8 @@ class SpacesContext implements Context { $fullUrl, $user, $this->featureContext->getPasswordForUser($user), - $body + $body, + $this->featureContext->getStepLineRef() ); } @@ -1911,7 +1921,8 @@ class SpacesContext implements Context { $fullUrl, $user, $this->featureContext->getPasswordForUser($user), - $body + $body, + $this->featureContext->getStepLineRef() ) ); $response = $this->featureContext->getResponseXml(null, __METHOD__); @@ -1972,7 +1983,7 @@ class SpacesContext implements Context { $fullUrl = $this->baseUrl . $this->ocsApiUrl . '/' . $shareId; return HttpRequestHelper::sendRequest( $fullUrl, - "", + $this->featureContext->getStepLineRef(), "PUT", $this->featureContext->getActualUsername($user), $this->featureContext->getPasswordForUser($user), @@ -2034,7 +2045,8 @@ class SpacesContext implements Context { $fullUrl, $user, $this->featureContext->getPasswordForUser($user), - $body + $body, + $this->featureContext->getStepLineRef() ) ); @@ -2134,7 +2146,7 @@ class SpacesContext implements Context { $this->featureContext->setResponse( HttpRequestHelper::delete( $fullUrl, - "", + $this->featureContext->getStepLineRef(), $user, $this->featureContext->getPasswordForUser($user) ) @@ -2161,7 +2173,7 @@ class SpacesContext implements Context { $this->featureContext->setResponse( HttpRequestHelper::delete( $spaceWebDavUrl, - "", + $this->featureContext->getStepLineRef(), $user, $this->featureContext->getPasswordForUser($user) ) @@ -2210,7 +2222,8 @@ class SpacesContext implements Context { $this->featureContext->getBaseUrl(), $user, $this->featureContext->getPasswordForUser($user), - $space["id"] + $space["id"], + $this->featureContext->getStepLineRef() ) ); } @@ -2282,7 +2295,8 @@ class SpacesContext implements Context { $this->featureContext->getBaseUrl(), $user, $this->featureContext->getPasswordForUser($user), - $space["id"] + $space["id"], + $this->featureContext->getStepLineRef() ) ); } @@ -2309,7 +2323,8 @@ class SpacesContext implements Context { $this->featureContext->getBaseUrl(), $user, $this->featureContext->getPasswordForUser($user), - $space["id"] + $space["id"], + $this->featureContext->getStepLineRef() ) ); } @@ -2351,7 +2366,7 @@ class SpacesContext implements Context { $space = $this->getSpaceByName($user, $spaceName); $fullUrl = $this->baseUrl . $this->davSpacesUrl . "trash-bin/" . $space["id"]; $this->featureContext->setResponse( - HttpRequestHelper::sendRequest($fullUrl, '', 'PROPFIND', $user, $this->featureContext->getPasswordForUser($user)) + HttpRequestHelper::sendRequest($fullUrl, $this->featureContext->getStepLineRef(), 'PROPFIND', $user, $this->featureContext->getPasswordForUser($user)) ); } @@ -2371,7 +2386,7 @@ class SpacesContext implements Context { $space = $this->getSpaceByNameManager($user, $spaceName); $fullUrl = $this->baseUrl . $this->davSpacesUrl . "trash-bin/" . $space["id"]; $this->featureContext->setResponse( - HttpRequestHelper::sendRequest($fullUrl, '', 'PROPFIND', $user, $this->featureContext->getPasswordForUser($user)) + HttpRequestHelper::sendRequest($fullUrl, $this->featureContext->getStepLineRef(), 'PROPFIND', $user, $this->featureContext->getPasswordForUser($user)) ); } @@ -2480,7 +2495,7 @@ class SpacesContext implements Context { $this->featureContext->setResponse( HttpRequestHelper::sendRequest( $fullUrl, - "", + $this->featureContext->getStepLineRef(), 'MOVE', $user, $this->featureContext->getPasswordForUser($user), @@ -2524,7 +2539,7 @@ class SpacesContext implements Context { $this->featureContext->setResponse( HttpRequestHelper::sendRequest( $fullUrl, - "", + $this->featureContext->getStepLineRef(), 'DELETE', $user, $this->featureContext->getPasswordForUser($user), @@ -2572,7 +2587,7 @@ class SpacesContext implements Context { $this->featureContext->setResponse( HttpRequestHelper::get( $fullUrl, - "", + $this->featureContext->getStepLineRef(), $user, $this->featureContext->getPasswordForUser($user) ) @@ -2867,7 +2882,8 @@ class SpacesContext implements Context { $fullUrl, $user, $this->featureContext->getPasswordForUser($user), - $body + $body, + $this->featureContext->getStepLineRef() ) ); @@ -3115,7 +3131,7 @@ class SpacesContext implements Context { $this->featureContext->getPasswordForUser($user), $resource, $properties, - "", + $this->featureContext->getStepLineRef(), "0", "files", WebDavHelper::DAV_VERSION_SPACES @@ -3237,7 +3253,7 @@ class SpacesContext implements Context { $this->featureContext->setResponse( HttpRequestHelper::get( $this->featureContext->getBaseUrl() . '/archiver?' . $queryString, - '', + $this->featureContext->getStepLineRef(), '', '', ) @@ -3328,7 +3344,7 @@ class SpacesContext implements Context { $this->featureContext->setResponse( HttpRequestHelper::get( $url, - '', + $this->featureContext->getStepLineRef(), $user, $this->featureContext->getPasswordForUser($user), ) diff --git a/tests/acceptance/features/bootstrap/TagContext.php b/tests/acceptance/features/bootstrap/TagContext.php index 4f51cf9401..1aeb2efefa 100644 --- a/tests/acceptance/features/bootstrap/TagContext.php +++ b/tests/acceptance/features/bootstrap/TagContext.php @@ -139,7 +139,8 @@ class TagContext implements Context { GraphHelper::getTags( $this->featureContext->getBaseUrl(), $user, - $this->featureContext->getPasswordForUser($user) + $this->featureContext->getPasswordForUser($user), + $this->featureContext->getStepLineRef() ) ); } diff --git a/tests/acceptance/features/bootstrap/WebDavLockingContext.php b/tests/acceptance/features/bootstrap/WebDavLockingContext.php index df721cd645..85a91cf529 100644 --- a/tests/acceptance/features/bootstrap/WebDavLockingContext.php +++ b/tests/acceptance/features/bootstrap/WebDavLockingContext.php @@ -642,6 +642,7 @@ class WebDavLockingContext implements Context { $password, 'GET', "/apps/testing/api/v1/app/core/lock-breaker-groups", + $this->featureContext->getStepLineRef(), (string) $ocsApiVersion );