-
-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #47735 from nextcloud/backport/46859/stable28
[stable28] Fix status check and saving of external storages
- Loading branch information
Showing
12 changed files
with
214 additions
and
19 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
build/integration/features/bootstrap/ExternalStorage.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| <?php | ||
| /** | ||
| * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
| use Behat\Gherkin\Node\TableNode; | ||
| use PHPUnit\Framework\Assert; | ||
|
|
||
| require __DIR__ . '/../../vendor/autoload.php'; | ||
|
|
||
| trait ExternalStorage { | ||
| private array $storageIds = []; | ||
|
|
||
| private array $lastExternalStorageData; | ||
|
|
||
| /** | ||
| * @AfterScenario | ||
| **/ | ||
| public function deleteCreatedStorages(): void { | ||
| foreach ($this->storageIds as $storageId) { | ||
| $this->deleteStorage($storageId); | ||
| } | ||
| $this->storageIds = []; | ||
| } | ||
|
|
||
| private function deleteStorage(string $storageId): void { | ||
| // Based on "runOcc" from CommandLine trait | ||
| $args = ['files_external:delete', '--yes', $storageId]; | ||
| $args = array_map(function ($arg) { | ||
| return escapeshellarg($arg); | ||
| }, $args); | ||
| $args[] = '--no-ansi --no-warnings'; | ||
| $args = implode(' ', $args); | ||
|
|
||
| $descriptor = [ | ||
| 0 => ['pipe', 'r'], | ||
| 1 => ['pipe', 'w'], | ||
| 2 => ['pipe', 'w'], | ||
| ]; | ||
| $process = proc_open('php console.php ' . $args, $descriptor, $pipes, $ocPath = '../..'); | ||
| $lastStdOut = stream_get_contents($pipes[1]); | ||
| proc_close($process); | ||
| } | ||
|
|
||
| /** | ||
| * @When logged in user creates external global storage | ||
| * | ||
| * @param TableNode $fields | ||
| */ | ||
| public function loggedInUserCreatesExternalGlobalStorage(TableNode $fields): void { | ||
| $this->sendJsonWithRequestToken('POST', '/index.php/apps/files_external/globalstorages', $fields); | ||
| $this->theHTTPStatusCodeShouldBe('201'); | ||
|
|
||
| $this->lastExternalStorageData = json_decode($this->response->getBody(), $asAssociativeArray = true); | ||
|
|
||
| $this->storageIds[] = $this->lastExternalStorageData['id']; | ||
| } | ||
|
|
||
| /** | ||
| * @When logged in user updates last external userglobal storage | ||
| * | ||
| * @param TableNode $fields | ||
| */ | ||
| public function loggedInUserUpdatesLastExternalUserglobalStorage(TableNode $fields): void { | ||
| $this->sendJsonWithRequestToken('PUT', '/index.php/apps/files_external/userglobalstorages/' . $this->lastExternalStorageData['id'], $fields); | ||
| $this->theHTTPStatusCodeShouldBe('200'); | ||
|
|
||
| $this->lastExternalStorageData = json_decode($this->response->getBody(), $asAssociativeArray = true); | ||
| } | ||
|
|
||
| /** | ||
| * @Then fields of last external storage match with | ||
| * | ||
| * @param TableNode $fields | ||
| */ | ||
| public function fieldsOfLastExternalStorageMatchWith(TableNode $fields): void { | ||
| foreach ($fields->getRowsHash() as $expectedField => $expectedValue) { | ||
| if (!array_key_exists($expectedField, $this->lastExternalStorageData)) { | ||
| Assert::fail("$expectedField was not found in response"); | ||
| } | ||
|
|
||
| Assert::assertEquals($expectedValue, $this->lastExternalStorageData[$expectedField], "Field '$expectedField' does not match ({$this->lastExternalStorageData[$expectedField]})"); | ||
| } | ||
| } | ||
|
|
||
| private function sendJsonWithRequestToken(string $method, string $url, TableNode $fields): void { | ||
| $isFirstField = true; | ||
| $fieldsAsJsonString = '{'; | ||
| foreach ($fields->getRowsHash() as $key => $value) { | ||
| $fieldsAsJsonString .= ($isFirstField ? '' : ',') . '"' . $key . '":' . $value; | ||
| $isFirstField = false; | ||
| } | ||
| $fieldsAsJsonString .= '}'; | ||
|
|
||
| $body = [ | ||
| 'headers' => [ | ||
| 'Content-Type' => 'application/json', | ||
| ], | ||
| 'body' => $fieldsAsJsonString, | ||
| ]; | ||
| $this->sendingAToWithRequesttoken($method, $url, $body); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.