diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-30 09:23:12 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-30 09:23:12 +0000 |
commit | c2173a1464abe4048486ffe350ad65545ce239ce (patch) | |
tree | 0909caa82bee876a6bea92a72edce16bc12a9570 /spec | |
parent | 535fa7d8598c8d1c8c0e29a45650fed7e3ac7022 (diff) | |
parent | b21024684b7c8f9fdef524873434e057de7a2713 (diff) | |
download | gitlab-ce-c2173a1464abe4048486ffe350ad65545ce239ce.tar.gz |
Merge branch 'feature/admin-merge-groups-and-projects' into 'master'
Merged the 'groups' and 'projects' tabs when viewing user profiles
Closes #24752
See merge request !8323
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/admin/admin_users_spec.rb | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb index e31325ce47b..55ffc6761f8 100644 --- a/spec/features/admin/admin_users_spec.rb +++ b/spec/features/admin/admin_users_spec.rb @@ -1,6 +1,8 @@ require 'spec_helper' describe "Admin::Users", feature: true do + include WaitForAjax + before { login_as :admin } describe "GET /admin/users" do @@ -252,5 +254,20 @@ describe "Admin::Users", feature: true do end expect(page).to have_content @project.name end + + it 'shows the group access level' do + within(:css, '.append-bottom-default + .panel') do + expect(page).to have_content 'Developer' + end + end + + it 'allows group membership to be revoked', js: true do + page.within(first('.group_member')) do + find('.btn-remove').click + end + wait_for_ajax + + expect(page).not_to have_selector('.group_member') + end end end |