From 257b96094f73672ede1de794d7428f2c34aad505 Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Wed, 23 Nov 2016 14:50:11 -0800
Subject: [PATCH] Minimize Ruby warnings in test suite

---
 Rakefile                |  3 +-
 test/test_api.rb        | 12 +++----
 test/test_extensions.rb | 10 +++---
 test/test_web.rb        | 79 +++++++++--------------------------------
 4 files changed, 29 insertions(+), 75 deletions(-)

diff --git a/Rakefile b/Rakefile
index 0748d16f..2e229062 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,8 +1,7 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  #SO MUCH NOISE
-  #test.warning = true
+  test.warning = true
   test.pattern = 'test/**/test_*.rb'
 end
 
diff --git a/test/test_api.rb b/test/test_api.rb
index 9d117772..8714131c 100644
--- a/test/test_api.rb
+++ b/test/test_api.rb
@@ -174,15 +174,15 @@ class TestApi < Sidekiq::Test
       before do
         ActiveJob::Base.queue_adapter = :sidekiq
         ActiveJob::Base.logger = nil
+      end
 
-        class ApiMailer < ActionMailer::Base
-          def test_email(*)
-          end
+      class ApiMailer < ActionMailer::Base
+        def test_email(*)
         end
+      end
 
-        class ApiJob < ActiveJob::Base
-          def perform(*)
-          end
+      class ApiJob < ActiveJob::Base
+        def perform(*)
         end
       end
 
diff --git a/test/test_extensions.rb b/test/test_extensions.rb
index 3dd38b8d..20146f61 100644
--- a/test/test_extensions.rb
+++ b/test/test_extensions.rb
@@ -117,10 +117,12 @@ class TestExtensions < Sidekiq::Test
 
       Sidekiq.instance_eval { remove_instance_variable :@delay_removed }
       # Reload modified modules
-      load 'sidekiq/extensions/action_mailer.rb'
-      load 'sidekiq/extensions/active_record.rb'
-      load 'sidekiq/extensions/generic_proxy.rb'
-      load 'sidekiq/extensions/class_methods.rb'
+      silence_warnings do
+        load 'sidekiq/extensions/action_mailer.rb'
+        load 'sidekiq/extensions/active_record.rb'
+        load 'sidekiq/extensions/generic_proxy.rb'
+        load 'sidekiq/extensions/class_methods.rb'
+      end
     end
   end
 
diff --git a/test/test_web.rb b/test/test_web.rb
index 4c6e772c..abc9a5bb 100644
--- a/test/test_web.rb
+++ b/test/test_web.rb
@@ -414,73 +414,26 @@ class TestWeb < Sidekiq::Test
         2.times { add_retry }
         3.times { add_scheduled }
         4.times { add_worker }
+      end
 
+      it 'works' do
         get '/stats'
         @response = Sidekiq.load_json(last_response.body)
-      end
-
-      it 'can refresh dashboard stats' do
         assert_equal 200, last_response.status
-      end
-
-      describe "for sidekiq" do
-        it 'are namespaced' do
-          assert_includes @response.keys, "sidekiq"
-        end
-
-        it 'reports processed' do
-          assert_equal 5, @response["sidekiq"]["processed"]
-        end
-
-        it 'reports failed' do
-          assert_equal 2, @response["sidekiq"]["failed"]
-        end
-
-        it 'reports busy' do
-          assert_equal 4, @response["sidekiq"]["busy"]
-        end
-
-        it 'reports processes' do
-          assert_equal 1, @response["sidekiq"]["processes"]
-        end
-
-        it 'reports retries' do
-          assert_equal 2, @response["sidekiq"]["retries"]
-        end
-
-        it 'reports scheduled' do
-          assert_equal 3, @response["sidekiq"]["scheduled"]
-        end
-
-        it 'reports latency' do
-          assert_equal 0, @response["sidekiq"]["default_latency"]
-        end
-      end
-
-      describe "for redis" do
-        it 'are namespaced' do
-          assert_includes @response.keys, "redis"
-        end
-
-        it 'reports version' do
-          assert_includes @response["redis"].keys, "redis_version"
-        end
-
-        it 'reports uptime' do
-          assert_includes @response["redis"].keys, "uptime_in_days"
-        end
-
-        it 'reports connected clients' do
-          assert_includes @response["redis"].keys, "connected_clients"
-        end
-
-        it 'reports user memory' do
-          assert_includes @response["redis"].keys, "used_memory_human"
-        end
-
-        it 'reports memory peak' do
-          assert_includes @response["redis"].keys, "used_memory_peak_human"
-        end
+        assert_includes @response.keys, "sidekiq"
+        assert_equal 5, @response["sidekiq"]["processed"]
+        assert_equal 2, @response["sidekiq"]["failed"]
+        assert_equal 4, @response["sidekiq"]["busy"]
+        assert_equal 1, @response["sidekiq"]["processes"]
+        assert_equal 2, @response["sidekiq"]["retries"]
+        assert_equal 3, @response["sidekiq"]["scheduled"]
+        assert_equal 0, @response["sidekiq"]["default_latency"]
+        assert_includes @response.keys, "redis"
+        assert_includes @response["redis"].keys, "redis_version"
+        assert_includes @response["redis"].keys, "uptime_in_days"
+        assert_includes @response["redis"].keys, "connected_clients"
+        assert_includes @response["redis"].keys, "used_memory_human"
+        assert_includes @response["redis"].keys, "used_memory_peak_human"
       end
     end