Merge branch 'qa-shl-fix-add_project_member_spec' into 'master'

Create and use a new user to avoid role based conflict

Closes #232886, #232722, and #232599

See merge request gitlab-org/gitlab!38038

qa/qa/specs/features/ee/browser_ui/3_create/repository/merge_with_code_owner_in_root_group_spec.rb

@@ -3,8 +3,13 @@
 module QA
   context 'Create' do
     describe 'Codeowners' do
-      context 'when the project is in the root group' do
-        let(:approver) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) }
+      context 'when the project is in the root group', :requires_admin do
+        let(:approver) do
+          Resource::User.fabricate_via_api! do |resource|
+            resource.api_client = Runtime::API::Client.as_admin
+          end
+        end
+
         let(:root_group) { Resource::Sandbox.fabricate_via_api! }
         let(:project) do
           Resource::Project.fabricate_via_api! do |project|
@@ -24,6 +29,7 @@ module QA
 
         after do
           group_or_project.remove_member(approver)
+          approver.remove_via_api!
         end
 
         context 'and the code owner is the root group' do

qa/qa/specs/features/ee/browser_ui/3_create/repository/merge_with_code_owner_in_subgroup_spec.rb

@@ -3,8 +3,13 @@
 module QA
   context 'Create' do
     describe 'Codeowners' do
-      context 'when the project is in a subgroup' do
-        let(:approver) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) }
+      context 'when the project is in a subgroup', :requires_admin do
+        let(:approver) do
+          Resource::User.fabricate_via_api! do |resource|
+            resource.api_client = Runtime::API::Client.as_admin
+          end
+        end
+
         let(:project) do
           Resource::Project.fabricate_via_api! do |project|
             project.name = "approve-and-merge"
@@ -22,6 +27,7 @@ module QA
 
         after do
           group_or_project.remove_member(approver)
+          approver.remove_via_api!
         end
 
         context 'and the code owner is the root group' do