From 79a95da021d6ab257cf4b27de91cdc25348d4496 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 11 Jun 2018 22:53:24 +0545 Subject: [PATCH] Remove extra copies of dav-versions.feature and davtest.txt --- .../features/apiWebdav/dav-versions.feature | 28 ---------- tests/integration/data/davtest.txt | 1 - .../integration/features/dav-versions.feature | 55 ------------------- 3 files changed, 84 deletions(-) delete mode 100644 tests/acceptance/features/apiWebdav/dav-versions.feature delete mode 100644 tests/integration/data/davtest.txt delete mode 100644 tests/integration/features/dav-versions.feature diff --git a/tests/acceptance/features/apiWebdav/dav-versions.feature b/tests/acceptance/features/apiWebdav/dav-versions.feature deleted file mode 100644 index 613002fb3bd1..000000000000 --- a/tests/acceptance/features/apiWebdav/dav-versions.feature +++ /dev/null @@ -1,28 +0,0 @@ -Feature: dav-versions - Background: - 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 diff --git a/tests/integration/data/davtest.txt b/tests/integration/data/davtest.txt deleted file mode 100644 index 09c3a96be2f5..000000000000 --- a/tests/integration/data/davtest.txt +++ /dev/null @@ -1 +0,0 @@ -Dav-Test \ No newline at end of file diff --git a/tests/integration/features/dav-versions.feature b/tests/integration/features/dav-versions.feature deleted file mode 100644 index 5caae2c371a6..000000000000 --- a/tests/integration/features/dav-versions.feature +++ /dev/null @@ -1,55 +0,0 @@ -Feature: dav-versions - Background: - Given using api version "2" - And using new dav path - And user "user0" exists - And file "/davtest.txt" does not exist for user "user0" - And as an "user0" - - Scenario: Upload file and no version is available - 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 - 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" 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" uploads file with content "123" to "/davtest.txt" - And user "user0" uploads file with content "12345" to "/davtest.txt" - And the version folder of file "/davtest.txt" for user "user0" contains "1" elements - When user "user0" restores version index "1" of file "/davtest.txt" - Then downloading file "davtest.txt" - And downloaded content should be "123" - - Scenario: User cannot access meta folder of a file which is owned by somebody else - Given user "user1" exists - And user "user0" uploads file with content "123" to "/davtest.txt" - And we save it into "FILEID" - And as an "user1" - When sending "PROPFIND" with exact url to "/remote.php/dav/meta/<>" - Then the HTTP status code should be "404" - - Scenario: User can access meta folder of a file which is owned by somebody else but shared with that user - Given user "user1" exists - And user "user0" uploads file with content "123" to "/davtest.txt" - And user "user0" uploads file with content "123456" to "/davtest.txt" - And we save it into "FILEID" - And as an "user0" - And creating a share with - | path | /davtest.txt | - | shareType | 0 | - | shareWith | user1 | - | permissions | 8 | - When as an "user1" - Then the version folder of fileId "<>" contains "1" elements