From 45acf52776236364a3ad9d21fe65715049d760c2 Mon Sep 17 00:00:00 2001 From: Peter Prochaska Date: Mon, 6 Nov 2017 16:05:28 +0100 Subject: [PATCH] behat test for restoring a file --- .../integration/features/bootstrap/WebDav.php | 2 - .../integration/features/dav-versions.feature | 48 +++++++++---------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/tests/integration/features/bootstrap/WebDav.php b/tests/integration/features/bootstrap/WebDav.php index c2b4a9fb374e..8e1095756103 100644 --- a/tests/integration/features/bootstrap/WebDav.php +++ b/tests/integration/features/bootstrap/WebDav.php @@ -188,7 +188,6 @@ public function downloadPublicFileInsideAFolderWithRange($path, $range) { * @param string $content */ public function downloadedContentShouldBe($content) { - die(); PHPUnit_Framework_Assert::assertEquals($content, (string)$this->response->getBody()); } @@ -541,7 +540,6 @@ public function userRestoresVersionNrOfFile($user, $versionIndex, $path) { $fileId = $this->getFileIdForPath($user, $path); $client = $this->getSabreClient($user); $versions = array_keys($this->listVersionFolder($user, '/meta/'.$fileId.'/v', 1)); - var_dump($versions[1], $this->makeSabrePath($user, $path));die(); $client->request('COPY', $versions[1], null, ['Destination' => $this->makeSabrePath($user, $path)]); } diff --git a/tests/integration/features/dav-versions.feature b/tests/integration/features/dav-versions.feature index 0c071709a862..4b4b0b5b66bc 100644 --- a/tests/integration/features/dav-versions.feature +++ b/tests/integration/features/dav-versions.feature @@ -3,30 +3,30 @@ Feature: dav-versions Given using api version "2" Given using new dav path -# Scenario: Upload file and no version is available -# Given user "user0" exists -# And as an "user0" -# When user "user0" uploads file "data/davtest.txt" to "/davtest.txt" -# Then the version folder of file "/davtest.txt" for user "user0" contains "0" elements -# -# Scenario: Upload a file twice and versions are available -# Given user "user0" exists -# And as an "user0" -# When user "user0" uploads file "data/davtest.txt" to "/davtest.txt" -# Then user "user0" uploads file "data/davtest.txt" to "/davtest.txt" -# And the version folder of file "/davtest.txt" for user "user0" contains "1" elements -# And the content length of file "/davtest.txt" with version index "1" for user "user0" in versions folder is "8" -# -# Scenario: Remove a file -# Given user "user0" exists -# And as an "user0" -# And user "user0" uploads file "data/davtest.txt" to "/davtest.txt" -# And user "user0" uploads file "data/davtest.txt" to "/davtest.txt" -# And the version folder of file "/davtest.txt" for user "user0" contains "1" elements -# And user "user0" deletes file "/davtest.txt" -# When user "user0" uploads file "data/davtest.txt" to "/davtest.txt" -# Then the version folder of file "/davtest.txt" for user "user0" contains "0" elements -# + Scenario: Upload file and no version is available + Given user "user0" exists + And as an "user0" + When user "user0" uploads file "data/davtest.txt" to "/davtest.txt" + Then the version folder of file "/davtest.txt" for user "user0" contains "0" elements + + Scenario: Upload a file twice and versions are available + Given user "user0" exists + And as an "user0" + When user "user0" uploads file "data/davtest.txt" to "/davtest.txt" + Then user "user0" uploads file "data/davtest.txt" to "/davtest.txt" + And the version folder of file "/davtest.txt" for user "user0" contains "1" elements + And the content length of file "/davtest.txt" with version index "1" for user "user0" in versions folder is "8" + + Scenario: Remove a file + Given user "user0" exists + And as an "user0" + And user "user0" uploads file "data/davtest.txt" to "/davtest.txt" + And user "user0" uploads file "data/davtest.txt" to "/davtest.txt" + And the version folder of file "/davtest.txt" for user "user0" contains "1" elements + And user "user0" deletes file "/davtest.txt" + When user "user0" uploads file "data/davtest.txt" to "/davtest.txt" + Then the version folder of file "/davtest.txt" for user "user0" contains "0" elements + Scenario: Restore a file and check, if the content is now in the current file Given user "user0" exists And as an "user0"