Merge branch 'ml-qa-fix-merge-request-approvals-test' into 'master'

Fix merge request approvals test and others

Closes #33762

See merge request gitlab-org/gitlab!18427

qa/qa/git/repository.rb

@@ -76,7 +76,7 @@ module QA
       end
 
       def configure_identity(name, email)
-        run(%Q{git config user.name #{name}})
+        run(%Q{git config user.name "#{name}"})
         run(%Q{git config user.email #{email}})
       end
 

qa/qa/resource/repository/commit.rb

@@ -59,9 +59,9 @@ module QA
 
         def actions
           pending_actions = []
-          @add_files.map { |file| pending_actions << file.merge({ action: "create" }) } if @add_files
-          @update_files.map { |file| pending_actions << file.merge({ action: "update" }) } if @update_files
-          pending_actions
+          pending_actions << @add_files.map { |file| file.merge({ action: "create" }) } if @add_files
+          pending_actions << @update_files.map { |file| file.merge({ action: "update" }) } if @update_files
+          pending_actions.flatten
         end
 
         private

qa/qa/resource/user.rb

@@ -26,7 +26,7 @@ module QA
       end
 
       def name
-        @name ||= api_resource&.dig(:name) || username
+        @name ||= api_resource&.dig(:name) || "QA User #{unique_id}"
       end
 
       def email
@@ -91,9 +91,8 @@ module QA
 
       def self.fabricate_or_use(username = nil, password = nil)
         if Runtime::Env.signup_disabled?
-          self.new.tap do |user|
+          self.fabricate_via_api! do |user|
             user.username = username
-            user.password = password
           end
         else
           self.fabricate!

qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb

@@ -46,7 +46,7 @@ module QA
           project.standalone = true
           project.add_name_uuid = false
           project.name = project_name
-          project.path_with_namespace = "#{user.name}/#{project_name}"
+          project.path_with_namespace = "#{user.username}/#{project_name}"
           project.user = user
           project.api_client = api_client
         end

qa/qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb

@@ -6,8 +6,10 @@ module QA
       include Runtime::Fixtures
 
       def login
-        Runtime::Browser.visit(:gitlab, Page::Main::Login)
-        Page::Main::Login.perform(&:sign_in_using_credentials)
+        unless Page::Main::Menu.perform(&:signed_in?)
+          Runtime::Browser.visit(:gitlab, Page::Main::Login)
+          Page::Main::Login.perform(&:sign_in_using_credentials)
+        end
       end
 
       before(:all) do

qa/spec/resource/user_spec.rb

@@ -35,8 +35,8 @@ describe QA::Resource::User do
   end
 
   describe '#name' do
-    it 'defaults to the username' do
-      expect(subject.name).to eq(subject.username)
+    it 'defaults to a name based on the username' do
+      expect(subject.name).to match(/#{subject.username.tr('-', ' ')}/i)
     end
 
     it 'retrieves the name from the api_resource if present' do