Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 12 deletions

diff --git a/qa/qa/page/group/sub_menus/members.rb b/qa/qa/page/group/sub_menus/members.rb
index c8b3f5bb422..33c4caaddcb 100644
--- a/qa/qa/page/group/sub_menus/members.rb
+++ b/qa/qa/page/group/sub_menus/members.rb
@@ -7,12 +7,9 @@ module QA
         class Members < Page::Base
           include Page::Component::UsersSelect
 
-          view 'app/views/groups/group_members/_new_group_member.html.haml' do
-            element :add_to_group_button
-          end
-
-          view 'app/helpers/groups/group_members_helper.rb' do
+          view 'app/views/shared/members/_invite_member.html.haml' do
             element :member_select_field
+            element :invite_member_button
           end
 
           view 'app/views/shared/members/_member.html.haml' do
@@ -24,7 +21,7 @@ module QA
 
           def add_member(username)
             select_user :member_select_field, username
-            click_element :add_to_group_button
+            click_element :invite_member_button
           end
 
           def update_access_level(username, access_level)
diff --git a/qa/qa/page/project/settings/members.rb b/qa/qa/page/project/settings/members.rb
index 2ef018fd983..fd3e0add2a6 100644
--- a/qa/qa/page/project/settings/members.rb
+++ b/qa/qa/page/project/settings/members.rb
@@ -8,9 +8,9 @@ module QA
           include Page::Component::UsersSelect
           include QA::Page::Component::Select2
 
-          view 'app/views/projects/project_members/_new_project_member.html.haml' do
-            element :member_select_input
-            element :add_member_button
+          view 'app/views/shared/members/_invite_member.html.haml' do
+            element :member_select_field
+            element :invite_member_button
           end
 
           view 'app/views/projects/project_members/_team.html.haml' do
@@ -21,7 +21,7 @@ module QA
             element :invite_group_tab
           end
 
-          view 'app/views/projects/project_members/_new_project_group.html.haml' do
+          view 'app/views/shared/members/_invite_group.html.haml' do
             element :group_select_field
             element :invite_group_button
           end
@@ -43,8 +43,8 @@ module QA
           end
 
           def add_member(username)
-            select_user :member_select_input, username
-            click_element :add_member_button
+            select_user :member_select_field, username
+            click_element :invite_member_button
           end
 
           def remove_group(group_name)