Add latest changes from gitlab-org/gitlab@master

18 files changed, 132 insertions, 64 deletions

diff --git a/qa/qa.rb b/qa/qa.rb
index 1cf6d7b79f7..a1ea71c81cc 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -489,6 +489,7 @@ module QA
       autoload :ProjectSelector, 'qa/page/component/project_selector'
       autoload :Snippet, 'qa/page/component/snippet'
       autoload :NewSnippet, 'qa/page/component/new_snippet'
+      autoload :InviteMembersModal, 'qa/page/component/invite_members_modal'
 
       module Issuable
         autoload :Common, 'qa/page/component/issuable/common'
diff --git a/qa/qa/flow/project.rb b/qa/qa/flow/project.rb
index 8a9e2c86332..db42a3a3594 100644
--- a/qa/qa/flow/project.rb
+++ b/qa/qa/flow/project.rb
@@ -5,6 +5,16 @@ module QA
     module Project
       module_function
 
+      def add_member(project:, username:)
+        project.visit!
+
+        Page::Project::Menu.perform(&:click_members)
+
+        Page::Project::Members.perform do |member_settings|
+          member_settings.add_member(username)
+        end
+      end
+
       def go_to_create_project_from_template
         if Page::Project::NewExperiment.perform(&:shown?)
           Page::Project::NewExperiment.perform(&:click_create_from_template_link)
diff --git a/qa/qa/page/component/invite_members_modal.rb b/qa/qa/page/component/invite_members_modal.rb
new file mode 100644
index 00000000000..fbddb37f15e
--- /dev/null
+++ b/qa/qa/page/component/invite_members_modal.rb
@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module QA
+  module Page
+    module Component
+      module InviteMembersModal
+        extend QA::Page::PageConcern
+
+        def self.included(base)
+          super
+
+          base.view 'app/assets/javascripts/invite_members/components/invite_members_modal.vue' do
+            element :invite_button
+            element :access_level_dropdown
+            element :invite_members_modal_content
+          end
+
+          base.view 'app/assets/javascripts/invite_members/components/group_select.vue' do
+            element :group_select_dropdown_search_field
+          end
+
+          base.view 'app/assets/javascripts/invite_members/components/invite_group_trigger.vue' do
+            element :invite_a_group_button
+          end
+
+          base.view 'app/assets/javascripts/invite_members/components/invite_members_trigger.vue' do
+            element :invite_members_button
+          end
+        end
+
+        def open_invite_members_modal
+          click_element :invite_members_button
+        end
+
+        def open_invite_group_modal
+          click_element :invite_a_group_button
+        end
+
+        def add_member(username, access_level = Resource::Members::AccessLevel::DEVELOPER)
+          open_invite_members_modal
+
+          within_element(:invite_members_modal_content) do
+            fill_element :access_level_dropdown, with: access_level
+
+            fill_in 'Search for members to invite', with: username
+
+            Support::WaitForRequests.wait_for_requests
+
+            click_button username
+
+            click_element :invite_button
+          end
+
+          Support::WaitForRequests.wait_for_requests
+
+          page.refresh
+        end
+
+        def invite_group(group_name, group_access = Resource::Members::AccessLevel::GUEST)
+          open_invite_group_modal
+
+          fill_element :access_level_dropdown, with: group_access
+
+          click_button 'Select a group'
+          fill_element :group_select_dropdown_search_field, group_name
+
+          Support::WaitForRequests.wait_for_requests
+
+          click_button group_name
+
+          click_element :invite_button
+
+          Support::WaitForRequests.wait_for_requests
+
+          page.refresh
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/group/members.rb b/qa/qa/page/group/members.rb
index 87423ae9d75..68a169d5a7f 100644
--- a/qa/qa/page/group/members.rb
+++ b/qa/qa/page/group/members.rb
@@ -4,18 +4,13 @@ module QA
   module Page
     module Group
       class Members < Page::Base
-        include QA::Page::Component::Select2
+        include Page::Component::InviteMembersModal
         include Page::Component::UsersSelect
 
         view 'app/assets/javascripts/vue_shared/components/remove_member_modal.vue' do
           element :remove_member_modal_content
         end
 
-        view 'app/views/shared/members/_invite_member.html.haml' do
-          element :member_select_field
-          element :invite_member_button
-        end
-
         view 'app/assets/javascripts/pages/groups/group_members/index.js' do
           element :member_row
           element :groups_list
@@ -32,31 +27,9 @@ module QA
         end
 
         view 'app/views/groups/group_members/index.html.haml' do
-          element :invite_group_tab
           element :groups_list_tab
         end
 
-        view 'app/views/shared/members/_invite_group.html.haml' do
-          element :group_select_field
-          element :invite_group_button
-        end
-
-        def select_group(group_name)
-          click_element :group_select_field
-          search_and_select(group_name)
-        end
-
-        def invite_group(group_name)
-          click_element :invite_group_tab
-          select_group(group_name)
-          click_element :invite_group_button
-        end
-
-        def add_member(username)
-          select_user :member_select_field, username
-          click_element :invite_member_button
-        end
-
         def update_access_level(username, access_level)
           within_element(:member_row, text: username) do
             click_element :access_level_dropdown
diff --git a/qa/qa/page/project/members.rb b/qa/qa/page/project/members.rb
index 7e722e02ad0..09264d95aed 100644
--- a/qa/qa/page/project/members.rb
+++ b/qa/qa/page/project/members.rb
@@ -4,21 +4,18 @@ module QA
   module Page
     module Project
       class Members < Page::Base
-        include QA::Page::Component::Select2
-
-        view 'app/views/shared/members/_invite_member.html.haml' do
-          element :member_select_field
-          element :invite_member_button
-        end
+        include QA::Page::Component::InviteMembersModal
 
         view 'app/views/projects/project_members/index.html.haml' do
-          element :invite_group_tab
           element :groups_list_tab
         end
 
-        view 'app/views/shared/members/_invite_group.html.haml' do
-          element :group_select_field
-          element :invite_group_button
+        view 'app/assets/javascripts/invite_members/components/invite_group_trigger.vue' do
+          element :invite_a_group_button
+        end
+
+        view 'app/assets/javascripts/invite_members/components/invite_members_trigger.vue' do
+          element :invite_members_button
         end
 
         view 'app/assets/javascripts/pages/projects/project_members/index.js' do
@@ -33,25 +30,7 @@ module QA
           element :remove_group_link_modal_content
         end
 
-        def select_group(group_name)
-          click_element :group_select_field
-          search_and_select(group_name)
-        end
-
-        def invite_group(group_name)
-          click_element :invite_group_tab
-          select_group(group_name)
-          click_element :invite_group_button
-        end
-
-        def add_member(username)
-          click_element :member_select_field
-          search_and_select username
-          click_element :invite_member_button
-        end
-
         def remove_group(group_name)
-          click_element :invite_group_tab
           click_element :groups_list_tab
 
           within_element(:group_row, text: group_name) do
diff --git a/qa/qa/resource/members.rb b/qa/qa/resource/members.rb
index a88980f26d8..c8f9feeca15 100644
--- a/qa/qa/resource/members.rb
+++ b/qa/qa/resource/members.rb
@@ -26,10 +26,23 @@ module QA
         JSON.parse(get(Runtime::API::Request.new(api_client, api_members_path).url).body)
       end
 
+      def invite_group(group, access_level = AccessLevel::GUEST)
+        Support::Retrier.retry_until do
+          QA::Runtime::Logger.debug(%Q[Sharing #{self.class.name} with #{group.name}])
+
+          response = post Runtime::API::Request.new(api_client, api_share_path).url, { group_id: group.id, group_access: access_level }
+          response.code == QA::Support::Api::HTTP_STATUS_CREATED
+        end
+      end
+
       def api_members_path
         "#{api_get_path}/members"
       end
 
+      def api_share_path
+        "#{api_get_path}/share"
+      end
+
       class AccessLevel
         NO_ACCESS      = 0
         MINIMAL_ACCESS = 5
diff --git a/qa/qa/resource/personal_access_token.rb b/qa/qa/resource/personal_access_token.rb
index 6b2301ba916..463e780f89b 100644
--- a/qa/qa/resource/personal_access_token.rb
+++ b/qa/qa/resource/personal_access_token.rb
@@ -22,7 +22,7 @@ module QA
           token_page.fill_token_name(name || 'api-test-token')
           token_page.check_api
           # Expire in 2 days just in case the token is created just before midnight
-          token_page.fill_expiry_date(Date.today + 2)
+          token_page.fill_expiry_date(Time.now.utc.to_date + 2)
           token_page.click_create_token_button
         end
       end
diff --git a/qa/qa/resource/project.rb b/qa/qa/resource/project.rb
index efb6c2c0591..28d0844e71c 100644
--- a/qa/qa/resource/project.rb
+++ b/qa/qa/resource/project.rb
@@ -272,10 +272,6 @@ module QA
         parse_body(get(Runtime::API::Request.new(api_client, api_pipelines_path).url))
       end
 
-      def share_with_group(invitee, access_level = Resource::Members::AccessLevel::DEVELOPER)
-        post Runtime::API::Request.new(api_client, "/projects/#{id}/share").url, { group_id: invitee.id, group_access: access_level }
-      end
-
       private
 
       def transform_api_resource(api_resource)
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/2fa_recovery_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/2fa_recovery_spec.rb
index e38a9f47bd6..8e03444b113 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/2fa_recovery_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/2fa_recovery_spec.rb
@@ -29,6 +29,7 @@ module QA
       end
 
       before do
+        Runtime::Feature.enable(:invite_members_group_modal, group: group)
         group.add_member(developer_user, Resource::Members::AccessLevel::DEVELOPER)
       end
 
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_in_with_2fa_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_in_with_2fa_spec.rb
index 2fc3ff2f18f..a8650d633c8 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/log_in_with_2fa_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_in_with_2fa_spec.rb
@@ -31,6 +31,7 @@ module QA
       let(:two_fa_expected_text) { /The group settings for.*require you to enable Two-Factor Authentication for your account.*You need to do this before/ }
 
       before do
+        Runtime::Feature.enable(:invite_members_group_modal, group: group)
         group.add_member(developer_user, Resource::Members::AccessLevel::DEVELOPER)
       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
index 85cfefd6c5c..728df77a266 100644
--- 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
@@ -6,7 +6,6 @@ module QA
       before do
         Runtime::Feature.enable('vue_project_members_list')
       end
-
       after do
         Runtime::Feature.disable('vue_project_members_list')
       end
@@ -16,9 +15,13 @@ module QA
 
         user = Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
 
-        Resource::Project.fabricate_via_api! do |project|
+        project = Resource::Project.fabricate_via_api! do |project|
           project.name = 'add-member-project'
-        end.visit!
+        end
+
+        Runtime::Feature.enable(:invite_members_group_modal)
+
+        project.visit!
 
         Page::Project::Menu.perform(&:click_members)
         Page::Project::Members.perform do |members|
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb
index d54ce0ac0fc..c8c483fc2aa 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb
@@ -21,6 +21,7 @@ module QA
       end
 
       before do
+        Runtime::Feature.enable(:invite_members_group_modal, group: group)
         group.add_member(user, Resource::Members::AccessLevel::MAINTAINER)
       end
 
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/protected_tags_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/protected_tags_spec.rb
index e40dde64675..600ce36d1e4 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/project/protected_tags_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/protected_tags_spec.rb
@@ -10,6 +10,10 @@ module QA
         end
       end
 
+      before do
+        Runtime::Feature.enable(:invite_members_group_modal, project: project)
+      end
+
       let(:developer_user) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) }
       let(:maintainer_user) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_2, Runtime::Env.gitlab_qa_password_2) }
       let(:tag_name) { 'v0.0.1' }
diff --git a/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
index f623efe5a3a..7c15937ef5e 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb
@@ -17,6 +17,7 @@ module QA
 
       before do
         Runtime::Feature.enable('vue_project_members_list', project: project)
+        Runtime::Feature.enable(:invite_members_group_modal)
         Flow::Login.sign_in
       end
 
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb
index a7f862e8911..9129584d110 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/check_mentions_for_xss_spec.rb
@@ -18,6 +18,8 @@ module QA
 
     describe 'check xss occurence in @mentions in issues', :requires_admin do
       before do
+        Runtime::Feature.enable(:invite_members_group_modal)
+
         Flow::Login.sign_in
 
         project.add_member(user)
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
index cc815fd0e67..2ce8c749e43 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/mentions_spec.rb
@@ -13,6 +13,7 @@ module QA
 
       before do
         Flow::Login.sign_in
+        Runtime::Feature.enable(:invite_members_group_modal, project: project)
 
         project.add_member(user)
 
diff --git a/qa/qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb b/qa/qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb
index 11f93d6a97e..2654531bc2c 100644
--- a/qa/qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb
+++ b/qa/qa/specs/features/browser_ui/2_plan/issue/real_time_assignee_spec.rb
@@ -14,6 +14,7 @@ module QA
       before do
         Runtime::Feature.enable('real_time_issue_sidebar', project: project)
         Runtime::Feature.enable('broadcast_issue_updates', project: project)
+        Runtime::Feature.enable(:invite_members_group_modal, project: project)
 
         Flow::Login.sign_in
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/move_project_create_fork_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/move_project_create_fork_spec.rb
index 7a727ffb291..0f6edca654b 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/move_project_create_fork_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/move_project_create_fork_spec.rb
@@ -19,6 +19,7 @@ module QA
       end
 
       before do
+        Runtime::Feature.enable(:invite_members_group_modal, project: parent_project)
         parent_project.add_member(user)
       end