From ee664acb356f8123f4f6b00b73c1e1cf0866c7fb Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 20 Oct 2022 09:40:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-5-stable-ee --- spec/lib/gitlab/database_spec.rb | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'spec/lib/gitlab/database_spec.rb') diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb index c893bca9e62..eb42734d044 100644 --- a/spec/lib/gitlab/database_spec.rb +++ b/spec/lib/gitlab/database_spec.rb @@ -32,21 +32,6 @@ RSpec.describe Gitlab::Database do end describe '.has_config?' do - context 'two tier database config' do - before do - allow(Gitlab::Application).to receive_message_chain(:config, :database_configuration, :[]).with(Rails.env) - .and_return({ "adapter" => "postgresql", "database" => "gitlabhq_test" }) - end - - it 'returns false for primary' do - expect(described_class.has_config?(:primary)).to eq(false) - end - - it 'returns false for ci' do - expect(described_class.has_config?(:ci)).to eq(false) - end - end - context 'three tier database config' do before do allow(Gitlab::Application).to receive_message_chain(:config, :database_configuration, :[]).with(Rails.env) -- cgit v1.2.3