Add test to add a new project memberml-qa-add-members

Adds a new QA test and the required page objects and related changes

8 files changed, 85 insertions, 4 deletions

diff --git a/app/views/projects/project_members/_new_project_member.html.haml b/app/views/projects/project_members/_new_project_member.html.haml
index 517fd249f6e..5e21442bb60 100644
--- a/app/views/projects/project_members/_new_project_member.html.haml
+++ b/app/views/projects/project_members/_new_project_member.html.haml
@@ -3,7 +3,7 @@
     = form_for @project_member, as: :project_member, url: project_project_members_path(@project), html: { class: 'users-project-form' } do |f|
       .form-group
         = label_tag :user_ids, "Select members to invite", class: "label-bold"
-        = users_select_tag(:user_ids, multiple: true, class: "input-clamp", scope: :all, email_user: true, placeholder: "Search for members to update or invite")
+        = users_select_tag(:user_ids, multiple: true, class: "input-clamp qa-member-select-input", scope: :all, email_user: true, placeholder: "Search for members to update or invite")
       .form-group
         = label_tag :access_level, "Choose a role permission", class: "label-bold"
         .select-wrapper
@@ -17,5 +17,5 @@
           = label_tag :expires_at, 'Access expiration date', class: 'label-bold'
           = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date', placeholder: 'Expiration date'
           %i.clear-icon.js-clear-input
-      = f.submit "Add to project", class: "btn btn-success"
+      = f.submit "Add to project", class: "btn btn-success qa-add-member-button"
       = link_to "Import", import_project_project_members_path(@project), class: "btn btn-default", title: "Import members from another project"
diff --git a/app/views/projects/project_members/_team.html.haml b/app/views/projects/project_members/_team.html.haml
index 0c5a187f208..9682f8ac922 100644
--- a/app/views/projects/project_members/_team.html.haml
+++ b/app/views/projects/project_members/_team.html.haml
@@ -14,5 +14,5 @@
           %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
             = icon("search")
         = render 'shared/members/sort_dropdown'
-  %ul.content-list.members-list
+  %ul.content-list.members-list.qa-members-list
     = render partial: 'shared/members/member', collection: members, as: :member
diff --git a/qa/qa.rb b/qa/qa.rb
index 952084085d5..74d2d2c8205 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -183,6 +183,7 @@ module QA
         autoload :SecretVariables, 'qa/page/project/settings/secret_variables'
         autoload :Runners, 'qa/page/project/settings/runners'
         autoload :MergeRequest, 'qa/page/project/settings/merge_request'
+        autoload :Members, 'qa/page/project/settings/members'
       end
 
       module Issue
@@ -254,6 +255,7 @@ module QA
       autoload :Dropzone, 'qa/page/component/dropzone'
       autoload :GroupsFilter, 'qa/page/component/groups_filter'
       autoload :Select2, 'qa/page/component/select2'
+      autoload :UsersSelect, 'qa/page/component/users_select'
     end
   end
 
diff --git a/qa/qa/factory/resource/user.rb b/qa/qa/factory/resource/user.rb
index eac2a873bd5..34b52223b2d 100644
--- a/qa/qa/factory/resource/user.rb
+++ b/qa/qa/factory/resource/user.rb
@@ -37,7 +37,10 @@ module QA
         product(:password) { |factory| factory.password }
 
         def fabricate!
-          Page::Menu::Main.perform { |main| main.sign_out }
+          # Don't try to log-out if we're not logged-in
+          if Page::Menu::Main.act { has_personal_area?(wait: 0) }
+            Page::Menu::Main.perform { |main| main.sign_out }
+          end
 
           if credentials_given?
             Page::Main::Login.perform do |login|
diff --git a/qa/qa/page/component/users_select.rb b/qa/qa/page/component/users_select.rb
new file mode 100644
index 00000000000..f88d6450a33
--- /dev/null
+++ b/qa/qa/page/component/users_select.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Component
+      module UsersSelect
+        def select_user(element, username)
+          find("#{element_selector_css(element)} input").set(username)
+          find('.ajax-users-dropdown .user-username', text: "@#{username}").click
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/menu/side.rb b/qa/qa/page/menu/side.rb
index a1eedfea42e..44df7abc34d 100644
--- a/qa/qa/page/menu/side.rb
+++ b/qa/qa/page/menu/side.rb
@@ -40,6 +40,14 @@ module QA
           end
         end
 
+        def click_members_settings
+          hover_settings do
+            within_submenu do
+              click_link('Members')
+            end
+          end
+        end
+
         def click_operations_kubernetes
           hover_operations do
             within_submenu do
diff --git a/qa/qa/page/project/settings/members.rb b/qa/qa/page/project/settings/members.rb
new file mode 100644
index 00000000000..7fed93ca83f
--- /dev/null
+++ b/qa/qa/page/project/settings/members.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Project
+      module Settings
+        class Members < Page::Base
+          include Page::Component::UsersSelect
+
+          view 'app/views/projects/project_members/_new_project_member.html.haml' do
+            element :member_select_input
+            element :add_member_button
+          end
+
+          view 'app/views/projects/project_members/_team.html.haml' do
+            element :members_list
+          end
+
+          def add_member(username)
+            select_user :member_select_input, username
+            click_element :add_member_button
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb
new file mode 100644
index 00000000000..fdfcf3db00e
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/add_project_member_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module QA
+  context :manage do
+    describe 'Add project member' do
+      it 'user adds project member' do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+
+        user = Factory::Resource::User.fabricate!
+
+        Page::Menu::Main.perform { |main| main.sign_out }
+        Page::Main::Login.act { sign_in_using_credentials }
+
+        Factory::Resource::Project.fabricate! do |resource|
+          resource.name = 'add-member-project'
+        end
+
+        Page::Menu::Side.act { click_members_settings }
+        Page::Project::Settings::Members.perform do |page|
+          page.add_member(user.username)
+        end
+
+        expect(page).to have_content("#{user.name} @#{user.username} Given access")
+      end
+    end
+  end
+end