mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-09 12:46:07 +10:00
Douwe MaanandRémy Coutable
b791f98f2e
Display group/project access requesters separately in admin ## What does this MR do? It displays the access requesters in a separate list in group & project members pages. It also harmonize the members counter UI to use `%span.badge` everywhere (in the admin & non-admin members views). ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? To not confuse access requesters with actual members. ## What are the relevant issue numbers? Closes #18871. ## Screenshots ### Group members | Before | After | | --------- | ---- | |  |  | ### Project members | Before | After | | --------- | ---- | |  |  | ### Admin group members | Before | After | | --------- | ---- | |  |  | ### Admin project members | Before | After | | --------- | ---- | |  |  | ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG since this is related to the original "request access" MR. - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4798 Signed-off-by: Rémy Coutable <remy@rymai.me>
50 lines
1.7 KiB
Gherkin
50 lines
1.7 KiB
Gherkin
@admin
|
|
Feature: Admin Groups
|
|
Background:
|
|
Given I sign in as an admin
|
|
And I have group with projects
|
|
And User "John Doe" exists
|
|
And I visit admin groups page
|
|
|
|
Scenario: See group list
|
|
Then I should be all groups
|
|
|
|
Scenario: Create a group
|
|
When I click new group link
|
|
And submit form with new group info
|
|
Then I should be redirected to group page
|
|
And I should see newly created group
|
|
|
|
@javascript
|
|
Scenario: Add user into projects in group
|
|
When I visit admin group page
|
|
When I select user "John Doe" from user list as "Reporter"
|
|
Then I should see "John Doe" in team list in every project as "Reporter"
|
|
|
|
Scenario: Shared projects
|
|
Given group has shared projects
|
|
When I visit group page
|
|
Then I should see project shared with group
|
|
|
|
@javascript
|
|
Scenario: Invite user to a group by e-mail
|
|
When I visit admin group page
|
|
When I select user "johndoe@gitlab.com" from user list as "Reporter"
|
|
Then I should see "johndoe@gitlab.com" in team list in every project as "Reporter"
|
|
|
|
@javascript
|
|
Scenario: Signed in admin should be able to add himself to a group
|
|
Given "John Doe" is owner of group "Owned"
|
|
When I visit group "Owned" members page
|
|
When I select current user as "Developer"
|
|
Then I should see current user as "Developer"
|
|
|
|
@javascript
|
|
Scenario: Signed in admin should be able to remove himself from group
|
|
Given current user is developer of group "Owned"
|
|
When I visit group "Owned" members page
|
|
Then I should see current user as "Developer"
|
|
When I click on the "Remove User From Group" button for current user
|
|
When I visit group "Owned" members page
|
|
Then I should not see current user as "Developer"
|