Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre

3 files changed, 5 insertions, 5 deletions

diff --git a/features/steps/admin/groups.rb b/features/steps/admin/groups.rb
index 9c1bcfefb9c..d761584ad93 100644
--- a/features/steps/admin/groups.rb
+++ b/features/steps/admin/groups.rb
@@ -40,7 +40,7 @@ class AdminGroups < Spinach::FeatureSteps
     user = User.find_by(name: "John Doe")
     select2(user.id, from: "#user_ids", multiple: true)
     within "#new_team_member" do
-      select "Reporter", from: "group_access"
+      select "Reporter", from: "access_level"
     end
     click_button "Add users into group"
   end
diff --git a/features/steps/group/group.rb b/features/steps/group/group.rb
index c3ee42f1127..d0ec503f47b 100644
--- a/features/steps/group/group.rb
+++ b/features/steps/group/group.rb
@@ -32,7 +32,7 @@ class Groups < Spinach::FeatureSteps
     click_link 'Add members'
     within ".users-group-form" do
       select2(user.id, from: "#user_ids", multiple: true)
-      select "Reporter", from: "group_access"
+      select "Reporter", from: "access_level"
     end
     click_button "Add users into group"
   end
diff --git a/features/steps/project/team_management.rb b/features/steps/project/team_management.rb
index ffc5016529f..76a0671721e 100644
--- a/features/steps/project/team_management.rb
+++ b/features/steps/project/team_management.rb
@@ -23,8 +23,8 @@ class ProjectTeamManagement < Spinach::FeatureSteps
     user = User.find_by(name: "Mike")
 
     select2(user.id, from: "#user_ids", multiple: true)
-    within "#new_team_member" do
-      select "Reporter", from: "project_access"
+    within "#new_project_member" do
+      select "Reporter", from: "access_level"
     end
     click_button "Add users"
   end
@@ -44,7 +44,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
   And 'I change "Sam" role to "Reporter"' do
     user = User.find_by(name: "Sam")
     within "#user_#{user.id}" do
-      select "Reporter", from: "team_member_project_access"
+      select "Reporter", from: "project_member_access_level"
     end
   end