From 1a5cc87d341dbd1bf7740f48cdb458de1f8d1fc6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 18 Feb 2021 15:30:35 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-9-stable-ee --- spec/lib/gitlab_spec.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'spec/lib') diff --git a/spec/lib/gitlab_spec.rb b/spec/lib/gitlab_spec.rb index 5f945d5b9fc..c5738ae730f 100644 --- a/spec/lib/gitlab_spec.rb +++ b/spec/lib/gitlab_spec.rb @@ -363,8 +363,13 @@ RSpec.describe Gitlab do expect(described_class.maintenance_mode?).to eq(false) end - it 'returns false when maintenance mode feature flag is disabled' do - stub_feature_flags(maintenance_mode: false) + it 'returns false when maintenance mode column is not present' do + stub_maintenance_mode_setting(true) + + allow(::Gitlab::CurrentSettings.current_application_settings) + .to receive(:respond_to?) + .with(:maintenance_mode, false) + .and_return(false) expect(described_class.maintenance_mode?).to eq(false) end -- cgit v1.2.3