Merge branch 'da-capitalize-db-apapter-name-on-rails-console' into 'master'

Display the database adapter name in a human-friendly way

See merge request gitlab-org/gitlab-ce!26437

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb
index ae50abd0e7a..5f57cd6b825 100644
--- a/spec/lib/gitlab/database_spec.rb
+++ b/spec/lib/gitlab/database_spec.rb
@@ -17,6 +17,20 @@ describe Gitlab::Database do
     end
   end
 
+  describe '.human_adapter_name' do
+    it 'returns PostgreSQL when using PostgreSQL' do
+      allow(described_class).to receive(:postgresql?).and_return(true)
+
+      expect(described_class.human_adapter_name).to eq('PostgreSQL')
+    end
+
+    it 'returns MySQL when using MySQL' do
+      allow(described_class).to receive(:postgresql?).and_return(false)
+
+      expect(described_class.human_adapter_name).to eq('MySQL')
+    end
+  end
+
   # These are just simple smoke tests to check if the methods work (regardless
   # of what they may return).
   describe '.mysql?' do