Add integration tests for double shares with rename in between
This commit is contained in:
parent
2404f6a5a7
commit
6d8d5f7bc5
|
@ -87,12 +87,12 @@ trait WebDav {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Given /^User "([^"]*)" moved file "([^"]*)" to "([^"]*)"$/
|
* @Given /^User "([^"]*)" moved (file|folder|entry) "([^"]*)" to "([^"]*)"$/
|
||||||
* @param string $user
|
* @param string $user
|
||||||
* @param string $fileSource
|
* @param string $fileSource
|
||||||
* @param string $fileDestination
|
* @param string $fileDestination
|
||||||
*/
|
*/
|
||||||
public function userMovedFile($user, $fileSource, $fileDestination){
|
public function userMovedFile($user, $entry, $fileSource, $fileDestination){
|
||||||
$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath;
|
$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath;
|
||||||
$headers['Destination'] = $fullUrl . $fileDestination;
|
$headers['Destination'] = $fullUrl . $fileDestination;
|
||||||
$this->response = $this->makeDavRequest($user, "MOVE", $fileSource, $headers);
|
$this->response = $this->makeDavRequest($user, "MOVE", $fileSource, $headers);
|
||||||
|
@ -100,12 +100,12 @@ trait WebDav {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @When /^User "([^"]*)" moves file "([^"]*)" to "([^"]*)"$/
|
* @When /^User "([^"]*)" moves (file|folder|entry) "([^"]*)" to "([^"]*)"$/
|
||||||
* @param string $user
|
* @param string $user
|
||||||
* @param string $fileSource
|
* @param string $fileSource
|
||||||
* @param string $fileDestination
|
* @param string $fileDestination
|
||||||
*/
|
*/
|
||||||
public function userMovesFile($user, $fileSource, $fileDestination){
|
public function userMovesFile($user, $entry, $fileSource, $fileDestination){
|
||||||
$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath;
|
$fullUrl = substr($this->baseUrl, 0, -4) . $this->davPath;
|
||||||
$headers['Destination'] = $fullUrl . $fileDestination;
|
$headers['Destination'] = $fullUrl . $fileDestination;
|
||||||
$this->response = $this->makeDavRequest($user, "MOVE", $fileSource, $headers);
|
$this->response = $this->makeDavRequest($user, "MOVE", $fileSource, $headers);
|
||||||
|
|
|
@ -888,3 +888,33 @@ Feature: sharing
|
||||||
And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "RDNVCK"
|
And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "RDNVCK"
|
||||||
And as "user0" the folder "merge-test-inside-twogroups-perms (2)" does not exist
|
And as "user0" the folder "merge-test-inside-twogroups-perms (2)" does not exist
|
||||||
And as "user0" the folder "merge-test-inside-twogroups-perms (3)" does not exist
|
And as "user0" the folder "merge-test-inside-twogroups-perms (3)" does not exist
|
||||||
|
|
||||||
|
Scenario: Merging shares for recipient when shared from outside with group then user and recipient renames in between
|
||||||
|
Given As an "admin"
|
||||||
|
And user "user0" exists
|
||||||
|
And user "user1" exists
|
||||||
|
And group "group1" exists
|
||||||
|
And user "user1" belongs to group "group1"
|
||||||
|
And user "user0" created a folder "merge-test-outside-groups-renamebeforesecondshare"
|
||||||
|
When folder "merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with group "group1"
|
||||||
|
And User "user1" moved folder "/merge-test-outside-groups-renamebeforesecondshare" to "/merge-test-outside-groups-renamebeforesecondshare-renamed"
|
||||||
|
And folder "merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with user "user1"
|
||||||
|
Then as "user1" gets properties of folder "merge-test-outside-groups-renamebeforesecondshare-renamed" with
|
||||||
|
|{http://owncloud.org/ns}permissions|
|
||||||
|
And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK"
|
||||||
|
And as "user1" the folder "merge-test-outside-groups-renamebeforesecondshare" does not exist
|
||||||
|
|
||||||
|
Scenario: Merging shares for recipient when shared from outside with user then group and recipient renames in between
|
||||||
|
Given As an "admin"
|
||||||
|
And user "user0" exists
|
||||||
|
And user "user1" exists
|
||||||
|
And group "group1" exists
|
||||||
|
And user "user1" belongs to group "group1"
|
||||||
|
And user "user0" created a folder "merge-test-outside-groups-renamebeforesecondshare"
|
||||||
|
When folder "merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with user "user1"
|
||||||
|
And User "user1" moved folder "/merge-test-outside-groups-renamebeforesecondshare" to "/merge-test-outside-groups-renamebeforesecondshare-renamed"
|
||||||
|
And folder "merge-test-outside-groups-renamebeforesecondshare" of user "user0" is shared with group "group1"
|
||||||
|
Then as "user1" gets properties of folder "merge-test-outside-groups-renamebeforesecondshare-renamed" with
|
||||||
|
|{http://owncloud.org/ns}permissions|
|
||||||
|
And the single response should contain a property "{http://owncloud.org/ns}permissions" with value "SRDNVCK"
|
||||||
|
And as "user1" the folder "merge-test-outside-groups-renamebeforesecondshare" does not exist
|
||||||
|
|
Loading…
Reference in New Issue