Merge branch 'remove-non-pajamas-alert-from-from' into 'master'

Update form_helper to remove non-pajamas option

See merge request gitlab-org/gitlab!95278

app/helpers/form_helper.rb

 # frozen_string_literal: true
 
 module FormHelper
-  def form_errors(model, type: 'form', truncate: [], pajamas_alert: false)
+  def form_errors(model, type: 'form', truncate: [], pajamas_alert: true)
     errors = model.errors
 
     return unless errors.any?
@@ -25,26 +25,17 @@ def form_errors(model, type: 'form', truncate: [], pajamas_alert: false)
       tag.li(message)
     end.join.html_safe
 
-    if pajamas_alert
-      render Pajamas::AlertComponent.new(
-        variant: :danger,
-        title: headline,
-        dismissible: false,
-        alert_options: { id: 'error_explanation', class: 'gl-mb-5' }
-      ) do |c|
-        c.body do
-          tag.ul(class: 'gl-pl-5 gl-mb-0') do
-            messages
-          end
+    render Pajamas::AlertComponent.new(
+      variant: :danger,
+      title: headline,
+      dismissible: false,
+      alert_options: { id: 'error_explanation', class: 'gl-mb-5' }
+    ) do |c|
+      c.body do
+        tag.ul(class: 'gl-pl-5 gl-mb-0') do
+          messages
         end
       end
-    else
-      tag.div(class: 'alert alert-danger', id: 'error_explanation') do
-        tag.h4(headline) <<
-          tag.ul do
-            messages
-          end
-      end
     end
   end
 

spec/helpers/form_helper_spec.rb

@@ -89,10 +89,7 @@
     it 'renders an appropriately styled alert div' do
       model = double(errors: errors_stub('Error 1'))
 
-      expect(helper.form_errors(model, pajamas_alert: false))
-        .to include('<div class="alert alert-danger" id="error_explanation">')
-
-      expect(helper.form_errors(model, pajamas_alert: true))
+      expect(helper.form_errors(model))
         .to include(
           '<div class="gl-alert gl-mb-5 gl-alert-danger gl-alert-not-dismissible" id="error_explanation" role="alert">'
         )