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

Consolidate user/group share actions into single dropdown #36587

Merged
merged 9 commits into from
Dec 17, 2019
Merged

Consolidate user/group share actions into single dropdown #36587

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aa62cca
WIP
felixheidecke Dec 12, 2019
95f1afd
Fix The sharingDialog PageObject for changed share actions dropdown
dpakach Dec 16, 2019
69ecc01
Fix tests and add scenarios for setting expiry date when enforcement …
dpakach Dec 16, 2019
1a1b41f
Fix code style and extend expiration date scenarios
dpakach Dec 16, 2019
9448730
Fix checking expiration date value in UI tests
dpakach Dec 16, 2019
58a2fe1
openShareActionsDropDown before clearExpirationDateFor
phil-davis Dec 16, 2019
f52ed88
Adjust federation sharing test for change in setting permissions
dpakach Dec 17, 2019
3a090a1
fix remaining failing tests
dpakach Dec 17, 2019
bd25355
Skip test failing on older version of firefox
dpakach Dec 17, 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 tests/acceptance/features/lib/FilesPageElement/SharingDialog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,10 +479,10 @@ public function setSharingPermissions(
. " xpath $this->showCrudsXpath could not find show-cruds button for user "
. $shareReceiverName
);
$showCrudsBtn->click();
foreach ($permissions as $permission => $value) {
//the additional permission disappear again after they are changed
//so we need to open them again and again
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this comment is no longer true?

$showCrudsBtn->click();
$value = \strtolower($value);

//to find where to click is a little bit complicated
Expand Down
20 changes: 10 additions & 10 deletions tests/acceptance/features/webUISharingExternal/federationSharing.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,20 +271,20 @@ Feature: Federation Sharing - sharing with users on other cloud storages
And as "user2" file "/simple-folder (2)/lorem.txt" should exist

Scenario: test resharing folder as readonly and set it as readonly by resharer
Given using server "LOCAL"
Given using server "REMOTE"
And user "user2" has been created with default attributes and without skeleton files
And user "user2" has created folder "simple-folder"
When the user shares folder "simple-folder" with remote user "user1@%remote_server_without_scheme%" using the webUI
And user "user1" re-logs in to "%remote_server%" using the webUI
When user "user1" from server "REMOTE" shares "simple-folder" with user "user1" from server "LOCAL" using the sharing API
And user "user1" re-logs in to "%local_server%" using the webUI
And the user accepts the offered remote shares using the webUI
And user "user1" from server "REMOTE" shares "/simple-folder (2)" with user "user2" from server "LOCAL" using the sharing API
And the user sets the sharing permissions of user "user2@%local_server%/ (federated)" for "simple-folder (2)" using the webUI to
And user "user1" from server "LOCAL" shares "/simple-folder (2)" with user "user2" from server "REMOTE" using the sharing API
And the user reloads the current page of the webUI
And the user sets the sharing permissions of user "user2@%remote_server%/ (federated)" for "simple-folder (2)" using the webUI to
| edit | no |
And user "user2" re-logs in to "%local_server%" using the webUI
And user "user2" re-logs in to "%remote_server%" using the webUI
And the user accepts the offered remote shares using the webUI
Then as "user2" folder "/simple-folder (2)" should exist
And as "user2" file "/simple-folder (2)/lorem.txt" should exist
When the user opens folder "simple-folder (2)" using the webUI
Then as "user2" folder "/simple-folder" should exist
And as "user2" file "/simple-folder/lorem.txt" should exist
When the user opens folder "simple-folder" using the webUI
Then it should not be possible to delete file "lorem.txt" using the webUI

Scenario: test resharing folder and set it as readonly by owner
Expand Down