Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 0 deletions

diff --git a/spec/lib/feature_spec.rb b/spec/lib/feature_spec.rb
index 3d59b1f35a9..2525dd17b89 100644
--- a/spec/lib/feature_spec.rb
+++ b/spec/lib/feature_spec.rb
@@ -171,6 +171,13 @@ describe Feature do
       end
     end
 
+    it 'returns the default value when the database does not exist' do
+      fake_default = double('fake default')
+      expect(ActiveRecord::Base).to receive(:connection) { raise ActiveRecord::NoDatabaseError, "No database" }
+
+      expect(described_class.enabled?(:a_feature, default_enabled: fake_default)).to eq(fake_default)
+    end
+
     context 'cached feature flag', :request_store do
       let(:flag) { :some_feature_flag }