From 659006c234ef2bcaefc160b9541644d6668b5d6c Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Wed, 1 Feb 2017 10:54:10 +0100 Subject: Add integration test for trashbin Add test for basic deletion. Add test when deleting from shared folder as recipient. Add test to check that metadata stays when moving out of shared folder as recipient. Signed-off-by: Morris Jobke --- .../features/bootstrap/BasicStructure.php | 11 +- build/integration/features/bootstrap/Trashbin.php | 120 +++++++++++++++++++++ 2 files changed, 121 insertions(+), 10 deletions(-) create mode 100644 build/integration/features/bootstrap/Trashbin.php (limited to 'build/integration/features/bootstrap') diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php index 8e1fcf86ba1..7933068b3b3 100644 --- a/build/integration/features/bootstrap/BasicStructure.php +++ b/build/integration/features/bootstrap/BasicStructure.php @@ -35,6 +35,7 @@ require __DIR__ . '/../../vendor/autoload.php'; trait BasicStructure { use Auth; + use Trashbin; /** @var string */ private $currentUser = ''; @@ -353,16 +354,6 @@ trait BasicStructure { fclose($file); } - /** - * @When User :user empties trashbin - * @param string $user - */ - public function emptyTrashbin($user) { - $body = new \Behat\Gherkin\Node\TableNode([['allfiles', 'true'], ['dir', '%2F']]); - $this->sendingToWithDirectUrl('POST', "/index.php/apps/files_trashbin/ajax/delete.php", $body); - $this->theHTTPStatusCodeShouldBe('200'); - } - /** * @When Sleep for :seconds seconds * @param int $seconds diff --git a/build/integration/features/bootstrap/Trashbin.php b/build/integration/features/bootstrap/Trashbin.php new file mode 100644 index 00000000000..c7d3a338ac1 --- /dev/null +++ b/build/integration/features/bootstrap/Trashbin.php @@ -0,0 +1,120 @@ + + * + * @copyright Copyright (c) 2017, ownCloud GmbH. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see + * + */ + +use GuzzleHttp\Client; +use GuzzleHttp\Message\ResponseInterface; + +require __DIR__ . '/../../vendor/autoload.php'; + +/** + * Trashbin functions + */ +trait Trashbin { + + /** + * @When User :user empties trashbin + * @param string $user user + */ + public function emptyTrashbin($user) { + $this->asAn($user); + $body = new \Behat\Gherkin\Node\TableNode([['allfiles', 'true'], ['dir', '%2F']]); + $this->sendingToWithDirectUrl('POST', "/index.php/apps/files_trashbin/ajax/delete.php", $body); + $this->theHTTPStatusCodeShouldBe('200'); + } + + /** + * List trashbin folder + * + * @param string $user user + * @param string $path path + * @return array response + */ + public function listTrashbinFolder($user, $path){ + $this->asAn($user); + $params = '?dir=' . rawurlencode('/' . trim($path, '/')); + $this->sendingToWithDirectUrl('GET', '/index.php/apps/files_trashbin/ajax/list.php' . $params, null); + $this->theHTTPStatusCodeShouldBe('200'); + + $response = json_decode($this->response->getBody(), true); + + return $response['data']['files']; + } + + /** + * @Then /^as "([^"]*)" the (file|folder|entry) "([^"]*)" exists in trash$/ + * @param string $user + * @param string $entryText + * @param string $path + */ + public function asTheFileOrFolderExistsInTrash($user, $entryText, $path) { + $path = trim($path, '/'); + $sections = explode('/', $path, 2); + + $firstEntry = $this->findFirstTrashedEntry($user, trim($sections[0], '/')); + + PHPUnit_Framework_Assert::assertNotNull($firstEntry); + + // query was on the main element ? + if (count($sections) === 1) { + // already found, return + return; + } + + $subdir = trim(dirname($sections[1]), '/'); + if ($subdir !== '' && $subdir !== '.') { + $subdir = $firstEntry . '/' . $subdir; + } else { + $subdir = $firstEntry; + } + + $listing = $this->listTrashbinFolder($user, $subdir); + $checkedName = basename($path); + + $found = false; + foreach ($listing as $entry) { + if ($entry['name'] === $checkedName) { + $found = true; + break; + } + } + + PHPUnit_Framework_Assert::assertTrue($found); + } + + /** + * Finds the first trashed entry matching the given name + * + * @param string $name + * @return string|null real entry name with timestamp suffix or null if not found + */ + private function findFirstTrashedEntry($user, $name) { + $listing = $this->listTrashbinFolder($user, '/'); + + foreach ($listing as $entry) { + if ($entry['name'] === $name) { + return $entry['name'] . '.d' . ((int)$entry['mtime'] / 1000); + } + } + + return null; + } +} + -- cgit v1.2.3