Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

2 files changed, 6 insertions, 6 deletions

diff --git a/spec/features/profiles/chat_names_spec.rb b/spec/features/profiles/chat_names_spec.rb
index b3d65ab3a3c..14fdb8ba56f 100644
--- a/spec/features/profiles/chat_names_spec.rb
+++ b/spec/features/profiles/chat_names_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'Profile > Chat', feature_category: :users do
       { team_id: 'T00', team_domain: 'my_chat_team', user_id: 'U01', user_name: 'my_chat_user' }
     end
 
-    let!(:authorize_url) { ChatNames::AuthorizeUserService.new(integration, params).execute }
+    let!(:authorize_url) { ChatNames::AuthorizeUserService.new(params).execute }
     let(:authorize_path) { URI.parse(authorize_url).request_uri }
 
     before do
diff --git a/spec/features/profiles/user_visits_profile_preferences_page_spec.rb b/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
index 9eee1b85e5e..e3940973c46 100644
--- a/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
+++ b/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe 'User visits the profile preferences page', :js, feature_category: :users do
-  include Select2Helper
+  include ListboxHelpers
 
   let(:user) { create(:user) }
 
@@ -30,7 +30,7 @@ RSpec.describe 'User visits the profile preferences page', :js, feature_category
 
   describe 'User changes their default dashboard', :js do
     it 'creates a flash message' do
-      select2('stars', from: '#user_dashboard')
+      select_from_listbox 'Starred Projects', from: 'Your Projects', exact_item_text: true
       click_button 'Save changes'
 
       wait_for_requests
@@ -39,7 +39,7 @@ RSpec.describe 'User visits the profile preferences page', :js, feature_category
     end
 
     it 'updates their preference' do
-      select2('stars', from: '#user_dashboard')
+      select_from_listbox 'Starred Projects', from: 'Your Projects', exact_item_text: true
       click_button 'Save changes'
 
       wait_for_requests
@@ -58,7 +58,7 @@ RSpec.describe 'User visits the profile preferences page', :js, feature_category
 
   describe 'User changes their language', :js do
     it 'creates a flash message', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/31404' do
-      select2('en', from: '#user_preferred_language')
+      select_from_listbox 'English', from: 'English'
       click_button 'Save changes'
 
       wait_for_requests
@@ -68,7 +68,7 @@ RSpec.describe 'User visits the profile preferences page', :js, feature_category
 
     it 'updates their preference' do
       wait_for_requests
-      select2('pt_BR', from: '#user_preferred_language')
+      select_from_listbox 'Portuguese', from: 'English'
       click_button 'Save changes'
 
       wait_for_requests