Add latest changes from gitlab-org/gitlab@master

5 files changed, 83 insertions, 15 deletions

diff --git a/qa/qa/page/project/members.rb b/qa/qa/page/project/members.rb
index 447049ce22a..7e722e02ad0 100644
--- a/qa/qa/page/project/members.rb
+++ b/qa/qa/page/project/members.rb
@@ -11,10 +11,6 @@ module QA
           element :invite_member_button
         end
 
-        view 'app/views/projects/project_members/_team.html.haml' do
-          element :members_list
-        end
-
         view 'app/views/projects/project_members/index.html.haml' do
           element :invite_group_tab
           element :groups_list_tab
@@ -25,11 +21,18 @@ module QA
           element :invite_group_button
         end
 
-        view 'app/views/shared/members/_group.html.haml' do
+        view 'app/assets/javascripts/pages/projects/project_members/index.js' do
           element :group_row
+        end
+
+        view 'app/assets/javascripts/members/components/action_buttons/remove_group_link_button.vue' do
           element :delete_group_access_link
         end
 
+        view 'app/assets/javascripts/members/components/modals/remove_group_link_modal.vue' do
+          element :remove_group_link_modal_content
+        end
+
         def select_group(group_name)
           click_element :group_select_field
           search_and_select(group_name)
@@ -50,10 +53,13 @@ module QA
         def remove_group(group_name)
           click_element :invite_group_tab
           click_element :groups_list_tab
-          page.accept_alert do
-            within_element(:group_row, text: group_name) do
-              click_element :delete_group_access_link
-            end
+
+          within_element(:group_row, text: group_name) do
+            click_element :delete_group_access_link
+          end
+
+          within_element(:remove_group_link_modal_content) do
+            click_button 'Remove group'
           end
         end
       end
diff --git a/qa/qa/resource/merge_request.rb b/qa/qa/resource/merge_request.rb
index 3f1a20a1b15..fd5f454f134 100644
--- a/qa/qa/resource/merge_request.rb
+++ b/qa/qa/resource/merge_request.rb
@@ -19,7 +19,8 @@ module QA
                     :file_name,
                     :file_content
       attr_writer :no_preparation,
-                  :wait_for_merge
+                  :wait_for_merge,
+                  :template
 
       attribute :merge_when_pipeline_succeeds
       attribute :merge_status
@@ -73,7 +74,8 @@ module QA
         Page::Project::Show.perform(&:new_merge_request)
         Page::MergeRequest::New.perform do |new_page|
           new_page.fill_title(@title)
-          new_page.fill_description(@description)
+          new_page.choose_template(@template) if @template
+          new_page.fill_description(@description) unless @template
           new_page.choose_milestone(@milestone) if @milestone
           new_page.assign_to_me if @assignee == 'me'
           labels.each do |label|
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 e71cbeb9837..85cfefd6c5c 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
@@ -1,8 +1,16 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Manage' do
+  RSpec.describe 'Manage', :requires_admin do
     describe 'Add project member' do
+      before do
+        Runtime::Feature.enable('vue_project_members_list')
+      end
+
+      after do
+        Runtime::Feature.disable('vue_project_members_list')
+      end
+
       it 'user adds project member', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/482' do
         Flow::Login.sign_in
 
@@ -16,7 +24,7 @@ module QA
         Page::Project::Members.perform do |members|
           members.add_member(user.username)
 
-          expect(members).to have_content(/@#{user.username}( Is using seat)?(\n| )?Given access/)
+          expect(members).to have_content("@#{user.username}")
         end
       end
     end
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 fbaf4241cec..f623efe5a3a 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
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Plan', :orchestrated, :smtp do
+  RSpec.describe 'Plan', :orchestrated, :smtp, :requires_admin do
     describe 'Email Notification' do
       include Support::Api
 
@@ -16,9 +16,14 @@ module QA
       end
 
       before do
+        Runtime::Feature.enable('vue_project_members_list', project: project)
         Flow::Login.sign_in
       end
 
+      after do
+        Runtime::Feature.disable('vue_project_members_list', project: project)
+      end
+
       it 'is received by a user for project invitation', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/676' do
         project.visit!
 
@@ -27,7 +32,7 @@ module QA
           member_settings.add_member(user.username)
         end
 
-        expect(page).to have_content(/@#{user.username}(\n| )?Given access/)
+        expect(page).to have_content("@#{user.username}")
 
         mailhog_items = mailhog_json.dig('items')
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_via_template_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_via_template_spec.rb
new file mode 100644
index 00000000000..d8341eff41d
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/create_merge_request_via_template_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module QA
+  RSpec.describe 'Create' do
+    describe 'Merge request custom templates' do
+      let(:template_name) { 'custom_merge_request_template'}
+      let(:template_content) { 'This is a custom merge request template test' }
+      let(:template_project) do
+        Resource::Project.fabricate_via_api! do |project|
+          project.name = 'custom-mr-template-project'
+          project.initialize_with_readme = true
+        end
+      end
+
+      let(:merge_request_title) { 'One merge request to rule them all' }
+
+      before do
+        Flow::Login.sign_in
+
+        Resource::Repository::Commit.fabricate_via_api! do |commit|
+          commit.project = template_project
+          commit.commit_message = 'Add custom merge request template'
+          commit.add_files([
+            {
+              file_path: ".gitlab/merge_request_templates/#{template_name}.md",
+              content: template_content
+            }
+          ])
+        end
+      end
+
+      it 'creates a merge request via custom template', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1230' do
+        Resource::MergeRequest.fabricate_via_browser_ui! do |merge_request|
+          merge_request.project = template_project
+          merge_request.title = merge_request_title
+          merge_request.template = template_name
+          merge_request.target_new_branch = false
+        end
+
+        Page::MergeRequest::Show.perform do |merge_request|
+          expect(merge_request).to have_title(merge_request_title)
+          expect(merge_request).to have_description(template_content)
+        end
+      end
+    end
+  end
+end