1 files changed, 10 insertions, 14 deletions
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb
index 9698dead67a..563818e8761 100644
--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
@@ -80,23 +80,19 @@ feature 'Admin updates settings' do
   end
 
   scenario 'Change Keys settings' do
-    uncheck 'RSA'
-    uncheck 'DSA'
-    uncheck 'ED25519'
-    select '384', from: 'Minimum ECDSA key length'
+    select 'Are forbidden', from: 'RSA SSH keys'
+    select 'Are allowed', from: 'DSA SSH keys'
+    select 'Must be at least 384 bits', from: 'ECDSA SSH keys'
+    select 'Are forbidden', from: 'ED25519 SSH keys'
     click_on 'Save'
 
-    expect(page).to have_content 'Application settings saved successfully'
-
-    expect(find_field('RSA', checked: false)).not_to be_checked
-    expect(find_field('DSA', checked: false)).not_to be_checked
-    expect(find_field('ED25519', checked: false)).not_to be_checked
-    expect(find_field('Minimum ECDSA key length').value).to eq '384'
+    forbidden = ApplicationSetting::FORBIDDEN_KEY_VALUE.to_s
 
-    uncheck 'ECDSA'
-    click_on 'Save'
-
-    expect(page).to have_content "Allowed key types can't be blank"
+    expect(page).to have_content 'Application settings saved successfully'
+    expect(find_field('RSA SSH keys').value).to eq(forbidden)
+    expect(find_field('DSA SSH keys').value).to eq('0')
+    expect(find_field('ECDSA SSH keys').value).to eq('384')
+    expect(find_field('ED25519 SSH keys').value).to eq(forbidden)
   end
 
   def check_all_events