1 files changed, 8 insertions, 9 deletions
diff --git a/spec/features/projects/integrations/user_uses_inherited_settings_spec.rb b/spec/features/projects/integrations/user_uses_inherited_settings_spec.rb
index 9ff344bcc88..9d9620c1461 100644
--- a/spec/features/projects/integrations/user_uses_inherited_settings_spec.rb
+++ b/spec/features/projects/integrations/user_uses_inherited_settings_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe 'User uses inherited settings', :js, feature_category: :integrations do
   include JiraIntegrationHelpers
+  include ListboxHelpers
 
   include_context 'project integration activation'
 
@@ -22,17 +23,16 @@ RSpec.describe 'User uses inherited settings', :js, feature_category: :integrati
 
         expect(page).not_to have_button('Use custom settings')
         expect(page).to have_field('Web URL', with: parent_settings[:url], readonly: true)
-        expect(page).to have_field('New API token, password, or Jira personal access token', with: '', readonly: true)
+        expect(page).to have_field('New API token or password', with: '', readonly: true)
 
-        click_on 'Use default settings'
-        click_on 'Use custom settings'
+        select_from_listbox('Use custom settings', from: 'Use default settings')
 
         expect(page).not_to have_button('Use default settings')
         expect(page).to have_field('Web URL', with: project_settings[:url], readonly: false)
-        expect(page).to have_field('New API token, password, or Jira personal access token', with: '', readonly: false)
+        expect(page).to have_field('New API token or password', with: '', readonly: false)
 
         fill_in 'Web URL', with: 'http://custom.com'
-        fill_in 'New API token, password, or Jira personal access token', with: 'custom'
+        fill_in 'New API token or password', with: 'custom'
 
         click_save_integration
 
@@ -53,14 +53,13 @@ RSpec.describe 'User uses inherited settings', :js, feature_category: :integrati
 
         expect(page).not_to have_button('Use default settings')
         expect(page).to have_field('URL', with: project_settings[:url], readonly: false)
-        expect(page).to have_field('New API token, password, or Jira personal access token', with: '', readonly: false)
+        expect(page).to have_field('New API token or password', with: '', readonly: false)
 
-        click_on 'Use custom settings'
-        click_on 'Use default settings'
+        select_from_listbox('Use default settings', from: 'Use custom settings')
 
         expect(page).not_to have_button('Use custom settings')
         expect(page).to have_field('URL', with: parent_settings[:url], readonly: true)
-        expect(page).to have_field('New API token, password, or Jira personal access token', with: '', readonly: true)
+        expect(page).to have_field('New API token or password', with: '', readonly: true)
 
         click_save_integration