summaryrefslogtreecommitdiff
path: root/spec/features/projects/members
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-12-09 18:11:47 +0000
committerFatih Acet <acetfatih@gmail.com>2016-12-09 18:11:47 +0000
commit5bb43bb9531422545f974df8a6cf5616b7631f51 (patch)
tree9a38a0888f498def6d26a5ee590963509a1085bd /spec/features/projects/members
parentb546fd7bba7434c787debb92e944b34420a0ee4c (diff)
parentfcf332a4fa544d4a5eba200878a7b9298e5b6f6b (diff)
downloadgitlab-ce-5bb43bb9531422545f974df8a6cf5616b7631f51.tar.gz
Merge branch 'members-dropdowns' into 'master'
Updated members dropdowns ## What does this MR do? EE has different dropdowns to allow for group LDAP members to be overridden, this ports the dropdown changes over to reduce conflicts. ## Screenshots (if relevant) ![Screen_Shot_2016-12-07_at_15.28.20](/uploads/6cb6def34015b024dc878aa3b99be4a0/Screen_Shot_2016-12-07_at_15.28.20.png) See merge request !7974
Diffstat (limited to 'spec/features/projects/members')
-rw-r--r--spec/features/projects/members/group_links_spec.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/spec/features/projects/members/group_links_spec.rb b/spec/features/projects/members/group_links_spec.rb
index cc2f695211c..94995f7cf95 100644
--- a/spec/features/projects/members/group_links_spec.rb
+++ b/spec/features/projects/members/group_links_spec.rb
@@ -16,12 +16,17 @@ feature 'Projects > Members > Anonymous user sees members', feature: true, js: t
end
it 'updates group access level' do
- select 'Guest', from: "member_access_level_#{group.id}"
+ click_button @group_link.human_access
+
+ page.within '.dropdown-menu' do
+ click_link 'Guest'
+ end
+
wait_for_ajax
visit namespace_project_project_members_path(project.namespace, project)
- expect(page).to have_select("member_access_level_#{group.id}", selected: 'Guest')
+ expect(first('.group_member')).to have_content('Guest')
end
it 'updates expiry date' do