Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

7 files changed, 106 insertions, 14 deletions

diff --git a/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/group/gitlab_migration_group_spec.rb
index 74125b092b8..a18e22f52f1 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/group/bulk_import_group_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/group/gitlab_migration_group_spec.rb
@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Manage', :requires_admin do
-    describe 'Bulk group import' do
-      let!(:staging?) { Runtime::Scenario.gitlab_address.include?('staging.gitlab.com') }
+  describe 'Manage', :requires_admin do
+    describe 'Gitlab migration' do
       let!(:admin_api_client) { Runtime::API::Client.as_admin }
       let!(:user) do
         Resource::User.fabricate_via_api! do |usr|
@@ -32,7 +31,7 @@ module QA
         Resource::BulkImportGroup.init do |group|
           group.api_client = api_client
           group.sandbox = sandbox
-          group.source_group_path = source_group.path
+          group.source_group = source_group
         end
       end
 
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
index 16f8df5a90d..098c0b3ba63 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
@@ -64,6 +64,7 @@ module QA
             Page::Profile::Accounts::Show.perform do |show|
               show.delete_account(user.password)
             end
+            Support::Waiter.wait_until { !user.exists? }
           end
 
           it 'allows recreating with same credentials', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347868' do
@@ -83,7 +84,7 @@ module QA
           end
 
           after do
-            @recreated_user.remove_via_api!
+            @recreated_user&.remove_via_api!
           end
 
           def admin_api_client
@@ -117,11 +118,12 @@ module QA
 
           Flow::Login.sign_in(as: @user, skip_page_validation: true)
 
-          Page::Registration::Welcome.perform(&:click_get_started_button_if_available)
+          Flow::UserOnboarding.onboard_user
 
-          Page::Main::Menu.perform do |menu|
-            expect(menu).to have_personal_area
-          end
+          # In development env and .com the user is asked to create a group and a project which can be skipped for
+          # the purpose of this test
+          Runtime::Browser.visit(:gitlab, Page::Dashboard::Welcome)
+          Page::Main::Menu.perform(&:has_personal_area?)
         end
 
         after do
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 6d09c8b1316..895027a588d 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,7 +1,11 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Manage', :requires_admin do
+  RSpec.describe 'Manage', :requires_admin, quarantine: {
+    issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/350598',
+    type: :needs_update,
+    only: { subdomain: :staging }
+  } do
     describe 'Add project member' do
       before do
         Runtime::Feature.enable(:invite_members_group_modal)
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb
index 7f40818da03..0063ce2613a 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb
@@ -2,7 +2,7 @@
 
 module QA
   RSpec.describe 'Manage', :smoke do
-    describe 'Project', :requires_admin do
+    describe 'Project' do
       shared_examples 'successful project creation' do
         it 'creates a new project' do
           Page::Project::Show.perform do |project_page|
@@ -17,7 +17,6 @@ module QA
       end
 
       before do
-        Runtime::Feature.enable(:paginatable_namespace_drop_down_for_project_creation)
         Flow::Login.sign_in
         project
       end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/invite_group_to_project_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/invite_group_to_project_spec.rb
new file mode 100644
index 00000000000..6997447411a
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/invite_group_to_project_spec.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module QA
+  # Tagging with issue for a transient invite group modal search bug, but does not require quarantine at this time
+  RSpec.describe 'Manage', :requires_admin, :transient, issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/349379' do
+    describe 'Invite group' do
+      shared_examples 'invites group to project' do
+        it 'verifies group is added and members can access project with correct access level' do
+          Page::Project::Menu.perform(&:click_members)
+          Page::Project::Members.perform do |project_members|
+            project_members.invite_group(group.path, 'Developer')
+
+            expect(project_members).to have_group(group.path)
+          end
+
+          Flow::Login.sign_in(as: @user)
+
+          Page::Dashboard::Projects.perform do |projects|
+            expect(projects).to have_project_with_access_role(project.name, 'Developer')
+          end
+
+          project.visit!
+
+          Page::Project::Show.perform do |project_page|
+            expect(project_page).to have_name(project.name)
+          end
+        end
+      end
+
+      before(:context) do
+        Runtime::Feature.enable(:invite_members_group_modal)
+        @user = Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1)
+      end
+
+      before do
+        Flow::Login.sign_in
+        group.add_member(@user, Resource::Members::AccessLevel::MAINTAINER)
+        project.visit!
+      end
+
+      context 'to personal namespace project', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349223' do
+        let(:group) do
+          Resource::Group.fabricate_via_api! do |group|
+            group.path = "group-for-personal-project-#{SecureRandom.hex(8)}"
+          end
+        end
+
+        let(:project) do
+          Resource::Project.fabricate_via_api! do |project|
+            project.name = 'personal-namespace-project'
+            project.personal_namespace = Runtime::User.username
+            project.visibility = :private
+            project.description = 'test personal namespace project'
+          end
+        end
+
+        it_behaves_like 'invites group to project'
+      end
+
+      context 'to group project', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349340' do
+        let(:group) do
+          Resource::Group.fabricate_via_api! do |group|
+            group.path = "group-for-group-project-#{SecureRandom.hex(8)}"
+          end
+        end
+
+        let(:project) do
+          Resource::Project.fabricate_via_api! do |project|
+            project.name = 'group-project'
+            project.visibility = :private
+            project.description = 'test group project'
+          end
+        end
+
+        it_behaves_like 'invites group to project'
+      end
+
+      after do
+        project&.remove_via_api!
+        group&.remove_via_api!
+      end
+
+      after(:context) do
+        Runtime::Feature.disable(:invite_members_group_modal)
+      end
+    end
+  end
+end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/project_access_token_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/project_access_token_spec.rb
index be8567ee0b6..c2bd61155b1 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/project/project_access_token_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/project/project_access_token_spec.rb
@@ -9,7 +9,7 @@ module QA
         expect(project_access_token.token).not_to be_nil
 
         project_access_token.revoke_via_ui!
-        expect(page).to have_text("Revoked project access token #{project_access_token.name}!")
+        expect(page).to have_text("Revoked access token #{project_access_token.name}!")
       end
 
       after do
diff --git a/qa/qa/specs/features/browser_ui/1_manage/user/follow_user_activity_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/user/follow_user_activity_spec.rb
index 43100929acd..87b51edef08 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/user/follow_user_activity_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/user/follow_user_activity_spec.rb
@@ -19,7 +19,7 @@ module QA
         group = QA::Resource::Group.fabricate_via_api! do |group|
           group.path = "group_for_follow_user_activity_#{SecureRandom.hex(8)}"
         end
-        group.add_member(user)
+        group.add_member(user, Resource::Members::AccessLevel::MAINTAINER)
         group
       end