Skip to content

[stable13] Fix filenames in sharing integration tests - #10044

Merged
MorrisJobke merged 2 commits into
stable13from
stable13-10040-fix-filenames-in-sharing-integration-tests
Jun 29, 2018
Merged

[stable13] Fix filenames in sharing integration tests#10044
MorrisJobke merged 2 commits into
stable13from
stable13-10040-fix-filenames-in-sharing-integration-tests

Conversation

@danxuliu

Copy link
Copy Markdown
Member

Backport of #10040

When a file is shared and the receiver of the share already has a file
with the same name that file is left untouched, and "(2)" is appended to
the name of the shared file.
As "textfile0.txt" is included in the user folder skeleton all the users
in the integration test have that file, so when it is shared the
receiver sees the share as "/textfile0 (2).txt", and her own file as
"/textfile0.txt".
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Add "PARENT (2)" and its subdirectories to the paths to be checked, as
before only the own "PARENT" folder was being checked, but not the
shared one.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliudanxuliu added the 3. to review Waiting for reviews label Jun 29, 2018
@danxuliudanxuliu added this to the Nextcloud 13.0.5 milestone Jun 29, 2018
@MorrisJobke
MorrisJobke merged commit 42de484 into stable13Jun 29, 2018
@MorrisJobke
MorrisJobke deleted the stable13-10040-fix-filenames-in-sharing-integration-tests branch June 29, 2018 07:03
@MorrisJobkeMorrisJobke mentioned this pull request Jul 10, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@danxuliu@rullzer@MorrisJobke