Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 28 deletions

diff --git a/spec/lib/gitlab/config_checker/puma_rugged_checker_spec.rb b/spec/lib/gitlab/config_checker/puma_rugged_checker_spec.rb
index 070887c83c3..badfd56d571 100644
--- a/spec/lib/gitlab/config_checker/puma_rugged_checker_spec.rb
+++ b/spec/lib/gitlab/config_checker/puma_rugged_checker_spec.rb
@@ -15,26 +15,10 @@ describe Gitlab::ConfigChecker::PumaRuggedChecker do
     end
 
     context 'application is puma' do
-      let(:notice_running_puma) do
-        {
-            type: 'info',
-            message: 'You are running Puma, which is currently experimental. '\
-                     'More information is available in our '\
-                     '<a href="https://docs.gitlab.com/ee/administration/operations/puma.html">documentation</a>.'
-        }
-      end
-      let(:notice_multi_threaded_puma) do
-        {
-            type: 'info',
-            message: 'Puma is running with a thread count above 1. '\
-                     'Information on deprecated GitLab features in this configuration is available in the '\
-                     '<a href="https://docs.gitlab.com/ee/administration/operations/puma.html">documentation</a>.'\
-        }
-      end
       let(:notice_multi_threaded_puma_with_rugged) do
         {
             type: 'warning',
-            message: 'Puma is running with a thread count above 1 and the rugged '\
+            message: 'Puma is running with a thread count above 1 and the Rugged '\
                      'service is enabled. This may decrease performance in some environments. '\
                      'See our <a href="https://docs.gitlab.com/ee/administration/operations/puma.html#performance-caveat-when-using-puma-with-rugged">documentation</a> '\
                      'for details of this issue.'
@@ -51,35 +35,29 @@ describe Gitlab::ConfigChecker::PumaRuggedChecker do
         let(:multithreaded_puma) { false }
         let(:rugged_enabled) { true }
 
-        it 'report running puma notice' do
-          is_expected.to contain_exactly(notice_running_puma)
-        end
+        it { is_expected.to be_empty }
       end
 
       context 'not multithreaded_puma and rugged API is not enabled' do
         let(:multithreaded_puma) { false }
         let(:rugged_enabled) { false }
 
-        it 'report running puma notice' do
-          is_expected.to contain_exactly(notice_running_puma)
-        end
+        it { is_expected.to be_empty }
       end
 
       context 'multithreaded_puma and rugged API is not enabled' do
         let(:multithreaded_puma) { true }
         let(:rugged_enabled) { false }
 
-        it 'report running puma notice and multi-thread puma notice' do
-          is_expected.to contain_exactly(notice_running_puma, notice_multi_threaded_puma)
-        end
+        it { is_expected.to be_empty }
       end
 
       context 'multithreaded_puma and rugged API is enabled' do
         let(:multithreaded_puma) { true }
         let(:rugged_enabled) { true }
 
-        it 'report puma/multi_threaded_puma/multi_threaded_puma_with_rugged notices' do
-          is_expected.to contain_exactly(notice_running_puma, notice_multi_threaded_puma, notice_multi_threaded_puma_with_rugged)
+        it 'report multi_threaded_puma_with_rugged notices' do
+          is_expected.to contain_exactly(notice_multi_threaded_puma_with_rugged)
         end
       end
     end