Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 4 deletions

diff --git a/spec/initializers/00_deprecations_spec.rb b/spec/initializers/00_deprecations_spec.rb
index a12d079082b..ee415861fe8 100644
--- a/spec/initializers/00_deprecations_spec.rb
+++ b/spec/initializers/00_deprecations_spec.rb
@@ -120,21 +120,27 @@ RSpec.describe '00_deprecations', feature_category: :shared do
 
       subject { ActiveSupport::Deprecation.warn('This is disallowed warning 1.') }
 
-      it 'raises ActiveSupport::DeprecationException' do
-        expect { subject }.to raise_error(ActiveSupport::DeprecationException)
+      it 'raises Exception and warns on stderr' do
+        expect { subject }
+          .to raise_error(Exception)
+          .and output(match(/^DEPRECATION WARNING: This is disallowed warning 1\./)).to_stderr
       end
 
       context 'when in production environment' do
         let(:rails_env) { 'production' }
 
-        it 'does not raise ActiveSupport::DeprecationException' do
+        it_behaves_like 'does not log to stderr'
+
+        it 'does not raise' do
           expect { subject }.not_to raise_error
         end
 
         context 'when GITLAB_LOG_DEPRECATIONS is set' do
           let(:gitlab_log_deprecations) { '1' }
 
-          it 'does not raise ActiveSupport::DeprecationException' do
+          it_behaves_like 'does not log to stderr'
+
+          it 'does not raise' do
             expect { subject }.not_to raise_error
           end
         end