move alert_class to ApplicationHelper (+ minor refactor); use valid css class in show_error_messages! helper

Author: markets

app/helpers/application_helper.rb

@@ -41,7 +41,7 @@ def show_error_messages!(resource)
     messages = resource.errors.
                full_messages.map { |msg| content_tag(:li, msg) }.join
     html = <<-HTML
-    <div class="alert alert-error alert-block">
+    <div class="alert alert-danger">
       <button type="button" class="close" data-dismiss="alert">x</button>
       <ul>
         #{messages}
@@ -83,4 +83,15 @@ def get_body_css_class(controller)
 
     "#{classes[controller]}"
   end
+
+  def alert_class(alert)
+    case alert
+    when 'error', 'alert'
+      'alert-danger'
+    when 'notice'
+      'alert-success'
+    else
+      'alert-info'
+    end
+  end
 end

app/helpers/messages_helper.rb

@@ -3,10 +3,10 @@
 
   <div class="alert <%= alert_class(key) %>">
     <button type="button" class="close" data-dismiss="alert">x</button>
-      <ul>
-        <li>
-          <%= value %>
-        </li>
-      </ul>
+    <ul>
+      <li>
+        <%= value %>
+      </li>
+    </ul>
   </div>
 <% end %>

app/views/layouts/_messages.html.erb

@@ -66,7 +66,7 @@
   config.error_notification_tag = :div
 
   # CSS class to add for error notification helper.
-  config.error_notification_class = 'alert alert-error'
+  config.error_notification_class = 'alert alert-danger'
 
   # ID to add for error notification helper.
   # config.error_notification_id = nil

config/initializers/simple_form.rb

@@ -19,4 +19,11 @@
       expect(helper.seconds_to_hm(3600)).to eq("1:00")
     end
   end
+
+  it 'alert_class returns specific error classes' do
+    expect(helper.alert_class('error')).to eq('alert-danger')
+    expect(helper.alert_class('alert')).to eq('alert-danger')
+    expect(helper.alert_class('notice')).to eq('alert-success')
+    expect(helper.alert_class('foo')).to eq('alert-info')
+  end
 end