1 files changed, 80 insertions, 19 deletions
diff --git a/spec/lib/gitlab/config_checker/external_database_checker_spec.rb b/spec/lib/gitlab/config_checker/external_database_checker_spec.rb
index 933b6d6be9e..9af6aed2b02 100644
--- a/spec/lib/gitlab/config_checker/external_database_checker_spec.rb
+++ b/spec/lib/gitlab/config_checker/external_database_checker_spec.rb
@@ -6,36 +6,97 @@ RSpec.describe Gitlab::ConfigChecker::ExternalDatabaseChecker do
   describe '#check' do
     subject { described_class.check }
 
-    context 'when database meets minimum supported version' do
+    let(:old_database_version) { 8 }
+    let(:old_database) { instance_double(Gitlab::Database::Reflection) }
+    let(:new_database) { instance_double(Gitlab::Database::Reflection) }
+
+    before do
+      allow(Gitlab::Database::Reflection).to receive(:new).and_return(new_database)
+      allow(old_database).to receive(:postgresql_minimum_supported_version?).and_return(false)
+      allow(old_database).to receive(:version).and_return(old_database_version)
+      allow(new_database).to receive(:postgresql_minimum_supported_version?).and_return(true)
+    end
+
+    context 'with a single database' do
       before do
-        allow(ApplicationRecord.database).to receive(:postgresql_minimum_supported_version?).and_return(true)
+        skip_if_multiple_databases_are_setup
+      end
+
+      context 'when database meets minimum supported version' do
+        before do
+          allow(Gitlab::Database::Reflection).to receive(:new).with(ActiveRecord::Base).and_return(new_database)
+        end
+
+        it { is_expected.to be_empty }
       end
 
-      it { is_expected.to be_empty }
+      context 'when database does not meet minimum supported version' do
+        before do
+          allow(Gitlab::Database::Reflection).to receive(:new).with(ActiveRecord::Base).and_return(old_database)
+        end
+
+        it 'reports deprecated database notice' do
+          is_expected.to contain_exactly(notice_deprecated_database(old_database_version))
+        end
+      end
     end
 
-    context 'when database does not meet minimum supported version' do
+    context 'with a multiple database' do
       before do
-        allow(ApplicationRecord.database).to receive(:postgresql_minimum_supported_version?).and_return(false)
+        skip_if_multiple_databases_not_setup
       end
 
-      let(:notice_deprecated_database) do
-        {
-          type: 'warning',
-          message: _('You are using PostgreSQL %{pg_version_current}, but PostgreSQL ' \
-                     '%{pg_version_minimum} is required for this version of GitLab. ' \
-                     'Please upgrade your environment to a supported PostgreSQL version, ' \
-                     'see %{pg_requirements_url} for details.') % {
-                                                                    pg_version_current: ApplicationRecord.database.version,
-                                                                    pg_version_minimum: Gitlab::Database::MINIMUM_POSTGRES_VERSION,
-                                                                    pg_requirements_url: '<a href="https://docs.gitlab.com/ee/install/requirements.html#database">database requirements</a>'
-                                                                  }
-        }
+      context 'when both databases meets minimum supported version' do
+        before do
+          allow(Gitlab::Database::Reflection).to receive(:new).with(ActiveRecord::Base).and_return(new_database)
+          allow(Gitlab::Database::Reflection).to receive(:new).with(Ci::ApplicationRecord).and_return(new_database)
+        end
+
+        it { is_expected.to be_empty }
+      end
+
+      context 'when the one of the databases does not meet minimum supported version' do
+        it 'reports deprecated database notice if the main database is using an old version' do
+          allow(Gitlab::Database::Reflection).to receive(:new).with(ActiveRecord::Base).and_return(old_database)
+          allow(Gitlab::Database::Reflection).to receive(:new).with(Ci::ApplicationRecord).and_return(new_database)
+          is_expected.to contain_exactly(notice_deprecated_database(old_database_version))
+        end
+
+        it 'reports deprecated database notice if the ci database is using an old version' do
+          allow(Gitlab::Database::Reflection).to receive(:new).with(ActiveRecord::Base).and_return(new_database)
+          allow(Gitlab::Database::Reflection).to receive(:new).with(Ci::ApplicationRecord).and_return(old_database)
+          is_expected.to contain_exactly(notice_deprecated_database(old_database_version))
+        end
       end
 
-      it 'reports deprecated database notice' do
-        is_expected.to contain_exactly(notice_deprecated_database)
+      context 'when both databases do not meet minimum supported version' do
+        before do
+          allow(Gitlab::Database::Reflection).to receive(:new).with(ActiveRecord::Base).and_return(old_database)
+          allow(Gitlab::Database::Reflection).to receive(:new).with(Ci::ApplicationRecord).and_return(old_database)
+        end
+
+        it 'reports deprecated database notice' do
+          is_expected.to match_array [
+            notice_deprecated_database(old_database_version),
+            notice_deprecated_database(old_database_version)
+          ]
+        end
       end
     end
   end
+
+  def notice_deprecated_database(database_version)
+    {
+      type: 'warning',
+      message: _('You are using PostgreSQL %{pg_version_current}, but PostgreSQL ' \
+                     '%{pg_version_minimum} is required for this version of GitLab. ' \
+                     'Please upgrade your environment to a supported PostgreSQL version, ' \
+                     'see %{pg_requirements_url} for details.') % \
+        {
+          pg_version_current: database_version,
+          pg_version_minimum: Gitlab::Database::MINIMUM_POSTGRES_VERSION,
+          pg_requirements_url: Gitlab::ConfigChecker::ExternalDatabaseChecker::PG_REQUIREMENTS_LINK
+        }
+    }
+  end
 end