Skip to content

change wording of exclude group from sharing tests #35735

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

Merged
phil-davis merged 1 commit into from
Jul 2, 2019
Merged

change wording of exclude group from sharing tests #35735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions tests/acceptance/features/bootstrap/WebUIAdminSharingSettingsContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,15 +220,15 @@ public function theAdministratorEnablesExcludeGroupsFromSharingUsingTheWebui() {
}

/**
* @When the administrator adds group :group to the group sharing blacklist using the webUI
* @Given the administrator has added group :group to the group sharing blacklist from the admin sharing settings page
* @When the administrator adds group :group to the exclude group from sharing list using the webUI
* @Given the administrator has added group :group to the exclude group from sharing list from the admin sharing settings page
*
* @param string $group
*
* @return void
*/
public function theAdministratorAddsGroupToTheGroupSharingBlacklistUsingTheWebui($group) {
$this->adminSharingSettingsPage->addGroupToGroupSharingBlacklist(
public function theAdministratorAddsGroupToTheExcludeGroupFromSharingList($group) {
$this->adminSharingSettingsPage->addGroupToExcludeGroupsFromSharingList(
$this->getSession(), $group
);
}
Expand Down
8 changes: 5 additions & 3 deletions tests/acceptance/features/lib/AdminSharingSettingsPage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class AdminSharingSettingsPage extends SharingSettingsPage {
protected $excludeGroupFromSharingCheckboxXpath = '//label[@for="shareapiExcludeGroups"]';
protected $excludeGroupFromSharingCheckboxId = 'shareapiExcludeGroups';

protected $groupSharingBlackListFieldXpath = '//p[@id="selectExcludedGroups"]//input[contains(@class,"select2-input")]';
protected $excludeGroupsFromSharingListFieldXpath = '//p[@id="selectExcludedGroups"]//input[contains(@class,"select2-input")]';
protected $excludeGroupFromSharesFieldXpath = '//div[@id="files_sharing"]//input[contains(@class,"select2-input")]';
protected $groupListXpath = '//div[@id="select2-drop"]//li[contains(@class, "select2-result")]';
protected $groupListDropDownXpath = "//div[@id='select2-drop']";
Expand Down Expand Up @@ -284,8 +284,10 @@ public function enableExcludeGroupFromSharing(Session $session) {
*
* @return void
*/
public function addGroupToGroupSharingBlacklist(Session $session, $groupName) {
$this->addGroupToInputField($groupName, $this->groupSharingBlackListFieldXpath);
public function addGroupToExcludeGroupsFromSharingList(
Session $session, $groupName
) {
$this->addGroupToInputField($groupName, $this->excludeGroupsFromSharingListFieldXpath);
$this->waitForAjaxCallsToStartAndFinish($session);
}

Expand Down
16 changes: 8 additions & 8 deletions tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Feature: Sharing files and folders with internal users
And user "user1" has been added to group "grp1"
And the administrator has browsed to the admin sharing settings page
When the administrator enables exclude groups from sharing using the webUI
And the administrator adds group "grp1" to the group sharing blacklist using the webUI
And the administrator adds group "grp1" to the exclude group from sharing list using the webUI
Then user "user1" should not be able to share file "testimage.jpg" with user "user3" using the sharing API

Scenario: user tries to share a folder from a group which is blacklisted from sharing
Expand All @@ -163,7 +163,7 @@ Feature: Sharing files and folders with internal users
And user "user1" has been added to group "grp1"
And the administrator has browsed to the admin sharing settings page
When the administrator enables exclude groups from sharing using the webUI
And the administrator adds group "grp1" to the group sharing blacklist using the webUI
And the administrator adds group "grp1" to the exclude group from sharing list using the webUI
Then user "user1" should not be able to share folder "simple-folder" with user "User Three" using the sharing API

Scenario: member of a blacklisted from sharing group tries to re-share a file received as a share
Expand All @@ -180,7 +180,7 @@ Feature: Sharing files and folders with internal users
And the administrator has browsed to the admin sharing settings page
And user "user3" has shared file "/testimage.jpg" with user "user1"
And the administrator has enabled exclude groups from sharing from the admin sharing settings page
When the administrator adds group "grp1" to the group sharing blacklist using the webUI
When the administrator adds group "grp1" to the exclude group from sharing list using the webUI
Then user "user1" should not be able to share file "/testimage (2).jpg" with user "User Four" using the sharing API

Scenario: member of a blacklisted from sharing group tries to re-share a folder received as a share
Expand All @@ -196,7 +196,7 @@ Feature: Sharing files and folders with internal users
And user "user3" has created folder "/common"
And user "user3" has shared folder "/common" with user "user1"
And the administrator has enabled exclude groups from sharing from the admin sharing settings page
When the administrator adds group "grp1" to the group sharing blacklist using the webUI
When the administrator adds group "grp1" to the exclude group from sharing list using the webUI
Then user "user1" should not be able to share folder "/common" with user "User Four" using the sharing API

Scenario: member of a blacklisted from sharing group tries to re-share a file inside a folder received as a share
Expand All @@ -213,7 +213,7 @@ Feature: Sharing files and folders with internal users
And user "user3" has moved file "/testimage.jpg" to "/common/testimage.jpg"
And user "user3" has shared folder "/common" with user "user1"
And the administrator has enabled exclude groups from sharing from the admin sharing settings page
When the administrator adds group "grp1" to the group sharing blacklist using the webUI
When the administrator adds group "grp1" to the exclude group from sharing list using the webUI
Then user "user1" should not be able to share file "/common/testimage.jpg" with user "User Four" using the sharing API

Scenario: member of a blacklisted from sharing group tries to re-share a folder inside a folder received as a share
Expand All @@ -228,7 +228,7 @@ Feature: Sharing files and folders with internal users
And user "user3" has created folder "/common/inside-common"
And user "user3" has shared folder "/common" with user "user1"
And the administrator has enabled exclude groups from sharing from the admin sharing settings page
When the administrator adds group "grp1" to the group sharing blacklist using the webUI
When the administrator adds group "grp1" to the exclude group from sharing list using the webUI
Then user "user1" should not be able to share folder "/common/inside-common" with user "User Four" using the sharing API

Scenario: user tries to share a file from a group which is blacklisted from sharing using webUI from files page
Expand All @@ -237,7 +237,7 @@ Feature: Sharing files and folders with internal users
And user "user1" has been added to group "grp1"
And the administrator has browsed to the admin sharing settings page
And the administrator has enabled exclude groups from sharing from the admin sharing settings page
When the administrator adds group "grp1" to the group sharing blacklist using the webUI
When the administrator adds group "grp1" to the exclude group from sharing list using the webUI
And the user re-logs in as "user1" using the webUI
And the user opens the sharing tab from the file action menu of file "testimage.jpg" using the webUI
Then the user should see an error message on the share dialog saying "Sharing is not allowed"
Expand All @@ -254,7 +254,7 @@ Feature: Sharing files and folders with internal users
And user "user2" has shared file "/testimage.jpg" with user "user1"
And the administrator has browsed to the admin sharing settings page
And the administrator has enabled exclude groups from sharing from the admin sharing settings page
When the administrator adds group "grp1" to the group sharing blacklist using the webUI
When the administrator adds group "grp1" to the exclude group from sharing list using the webUI
And the user re-logs in as "user1" using the webUI
And the user browses to the shared-with-you page
And the user opens the sharing tab from the file action menu of file "testimage (2).jpg" using the webUI
Expand Down