Fix diagnostics database page

Author: Fryguy

app/helpers/ops_helper.rb

@@ -22,19 +22,19 @@ def row_data(label, value)
   end
 
   def database_details
-    @database_details = ActiveRecord::Base.configurations[Rails.env]
+    @database_details = ActiveRecord::Base.configurations.configs_for(:env_name => Rails.env).first.configuration_hash
     @database_display_name =
-      if @database_details["host"].in?([nil, "", "localhost", "127.0.0.1"])
+      if @database_details[:host].in?([nil, "", "localhost", "127.0.0.1"])
         _("Internal Database")
       else
         _("External Database")
       end
       @data = {:title => _('Basic Information')}
       @data[:rows] = [
         row_data(_('Name'), @database_display_name),
-        row_data(_('Hostname'), @database_details["host"]),
-        row_data(_('Database name'), @database_details["database"]),
-        row_data(_('Username'), @database_details["username"])
+        row_data(_('Hostname'), @database_details[:host]),
+        row_data(_('Database name'), @database_details[:database]),
+        row_data(_('Username'), @database_details[:username])
       ]
   end
 

spec/helpers/ops_helper_spec.rb

@@ -1,4 +1,17 @@
 describe OpsHelper do
+  it "#database_details" do
+    db_config = ActiveRecord::Base.configurations.configs_for(:env_name => Rails.env).first.configuration_hash
+
+    expect(helper.database_details).to match_array(
+      [
+        {:cells => a_hash_including(:label => "Name", :value => a_string_matching(/ Database$/))},
+        {:cells => {:label => "Hostname",      :value => db_config[:host]}},
+        {:cells => {:label => "Database name", :value => db_config[:database]}},
+        {:cells => {:label => "Username",      :value => db_config[:username]}},
+      ]
+    )
+  end
+
   describe '#auth_mode_name' do
     modes = %w[amazon httpd database]
     modes_pretty = %w[Amazon External\ Authentication Database]