Merge branch...

Merge branch '474650-gerardo-navarro-step-up-auth-with-oidc-for-admin-mode-pre-work-login-helper-additional-info' into 'master' 

test: Refactor login helper to allow additional info for raw_info

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173300



Merged-by: Dylan Griffith <dyl.griffith@gmail.com>
Approved-by: Shreyas Agarwal <sagarwal@gitlab.com>
Approved-by: Drew Blessing <drew@gitlab.com>
Approved-by: Dylan Griffith <dyl.griffith@gmail.com>
Reviewed-by: Gerardo Navarro <gerardo@b310.de>
Co-authored-by: Gerardo Navarro <gerardo@b310.de>

ee/spec/lib/gitlab/auth/group_saml/auth_hash_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Auth::GroupSaml::AuthHash do
+RSpec.describe Gitlab::Auth::GroupSaml::AuthHash, feature_category: :system_access do
   let(:omniauth_auth_hash) do
     OmniAuth::AuthHash.new(extra: { raw_info: OneLogin::RubySaml::Attributes.new(raw_info_attr) })
   end

ee/spec/lib/gitlab/auth/saml/user_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Auth::Saml::User do
+RSpec.describe Gitlab::Auth::Saml::User, feature_category: :system_access do
   include LdapHelpers
   include LoginHelpers
 

spec/lib/gitlab/auth/saml/auth_hash_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Auth::Saml::AuthHash do
+RSpec.describe Gitlab::Auth::Saml::AuthHash, feature_category: :system_access do
   include LoginHelpers
 
   let(:raw_info_attr) { { 'groups' => %w[Developers Freelancers] } }

spec/support/helpers/login_helpers.rb

@@ -181,7 +181,7 @@ def configure_mock_auth(provider, uid, email, response_object: nil, additional_i
         ),
         response_object: response_object
       }
-    }).merge(additional_info) { |_, old_hash, new_hash| old_hash.merge(new_hash) }
+    }).merge(additional_info)
   end
 
   def mock_auth_hash(provider, uid, email, additional_info: {}, response_object: nil, name: 'mockuser', groups: [])