diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2017-11-13 22:24:03 +0000 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-11-13 22:24:03 +0000 |
commit | 6fa53d297fafbab163fa3e3dd86d10d8f141f2da (patch) | |
tree | 508bb4e52b8ec616f78d4f28e5d508c10028de1f /spec/features | |
parent | 6ffb9ffd4ad54fc452f9ae1e97a41f7a83f96a1c (diff) | |
parent | a591b1c3aca8587f4f3764fa01cd19f3372bb23f (diff) | |
download | gitlab-ce-6fa53d297fafbab163fa3e3dd86d10d8f141f2da.tar.gz |
Merge branch 'bvl-refresh-member-listing-on-removal' into 'master'
Don't perform a JS request when deleting a membership.
Closes #39933 and #31720
See merge request gitlab-org/gitlab-ce!15344
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/groups/members/manage_members.rb | 6 | ||||
-rw-r--r-- | spec/features/projects/members/list_spec.rb | 16 |
2 files changed, 21 insertions, 1 deletions
diff --git a/spec/features/groups/members/manage_members.rb b/spec/features/groups/members/manage_members.rb index 9039b283393..da1e17225db 100644 --- a/spec/features/groups/members/manage_members.rb +++ b/spec/features/groups/members/manage_members.rb @@ -44,7 +44,11 @@ feature 'Groups > Members > Manage members' do visit group_group_members_path(group) - find(:css, '.project-members-page li', text: user2.name).find(:css, 'a.btn-remove').click + accept_confirm do + find(:css, '.project-members-page li', text: user2.name).find(:css, 'a.btn-remove').click + end + + wait_for_requests expect(page).not_to have_content(user2.name) expect(group.users).not_to include(user2) diff --git a/spec/features/projects/members/list_spec.rb b/spec/features/projects/members/list_spec.rb index 237c059e595..65b11a1d9e7 100644 --- a/spec/features/projects/members/list_spec.rb +++ b/spec/features/projects/members/list_spec.rb @@ -55,6 +55,22 @@ feature 'Project members list' do end end + scenario 'remove user from project', :js do + other_user = create(:user) + project.add_developer(other_user) + + visit_members_page + + accept_confirm do + find(:css, 'li.project_member', text: other_user.name).find(:css, 'a.btn-remove').click + end + + wait_for_requests + + expect(page).not_to have_content(other_user.name) + expect(project.users).not_to include(other_user) + end + scenario 'invite user to project', :js do visit_members_page |