Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #36067 - start rename index with 2 #36068

Merged
merged 2 commits into from
Aug 23, 2019
Merged

Fixes #36067 - start rename index with 2 #36068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e66f092
Fixes #36067 - start rename index with 2
DeepDiver1975 Aug 20, 2019
3142cc9
adjust tests demonstrating issue #36067
individual-it Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/dav/lib/Files/PublicFiles/PublicFilesPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private function newFileName($path) {
$fileName = $pathInfo['filename'];
$ext = $pathInfo['extension'];

$i = 1;
$i = 2;
while ($this->server->tree->nodeExists("$dirName/$fileName ($i).$ext")) {
$i++;
}
Expand Down
4 changes: 1 addition & 3 deletions tests/acceptance/features/apiShareOperations/uploadToShare.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ Feature: sharing
And the content of file "/FOLDER/test (2).txt" for user "user0" should be "test2"

@smokeTest @public_link_share-feature-required
@issue-36067
Scenario: Uploading same file to a public upload-only share multiple times via new API
# The new API does the autorename automatically in upload-only folders
Given as user "user0"
Expand All @@ -28,8 +27,7 @@ Feature: sharing
When the public uploads file "test.txt" with content "test2" using the new public WebDAV API
Then the HTTP status code should be "201"
And the content of file "/FOLDER/test.txt" for user "user0" should be "test"
And the content of file "/FOLDER/test (1).txt" for user "user0" should be "test2"
#And the content of file "/FOLDER/test (2).txt" for user "user0" should be "test2"
And the content of file "/FOLDER/test (2).txt" for user "user0" should be "test2"

@public_link_share-feature-required
@issue-36055
Expand Down