diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-08-19 20:08:03 +0300 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-19 23:31:30 +0300 |
commit | f6dc80c4b45a193267fe3f156a12967b46b1ef60 (patch) | |
tree | d3e75aea16ef2899de6162bf55a74c8eea5f0052 /features | |
parent | ebc9d34d242e9c7821bef64acb07a5101525604d (diff) |
Merge branch 'expiration-date-on-memberships' into 'master'
Expiration date on memberships
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17495
See merge request !5876
Diffstat (limited to 'features')
-rw-r--r-- | features/steps/group/members.rb | 4 | ||||
-rw-r--r-- | features/steps/project/team_management.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/features/steps/group/members.rb b/features/steps/group/members.rb index dfa2fa75def..e9b45823c67 100644 --- a/features/steps/group/members.rb +++ b/features/steps/group/members.rb @@ -116,8 +116,8 @@ class Spinach::Features::GroupMembers < Spinach::FeatureSteps member = mary_jane_member page.within "#group_member_#{member.id}" do - click_button "Edit access level" - select 'Developer', from: 'group_member_access_level' + click_button 'Edit' + select 'Developer', from: "member_access_level_#{member.id}" click_on 'Save' end end diff --git a/features/steps/project/team_management.rb b/features/steps/project/team_management.rb index f32576d2cb1..e920f5a706b 100644 --- a/features/steps/project/team_management.rb +++ b/features/steps/project/team_management.rb @@ -65,8 +65,8 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps user = User.find_by(name: 'Dmitriy') project_member = project.project_members.find_by(user_id: user.id) page.within "#project_member_#{project_member.id}" do - click_button "Edit access level" - select "Reporter", from: "project_member_access_level" + click_button 'Edit' + select "Reporter", from: "member_access_level_#{project_member.id}" click_button "Save" end end |