Fix various flaky tests due to process-wide data changes

test/test_util.rb

@@ -3,12 +3,13 @@ require_relative 'helper'
 require 'sidekiq/util'
 
 class TestUtil < Minitest::Test
-
   class Helpers
     include Sidekiq::Util
   end
 
   def test_event_firing
+    before_handlers = Sidekiq.options[:lifecycle_events][:startup]
+    begin
       Sidekiq.options[:lifecycle_events][:startup] = [proc { raise "boom" }]
       h = Helpers.new
       h.fire_event(:startup)
@@ -17,5 +18,8 @@ class TestUtil < Minitest::Test
       assert_raises RuntimeError do
         h.fire_event(:startup, reraise: true)
       end
+    ensure
+      Sidekiq.options[:lifecycle_events][:startup] = before_handlers
+    end
   end
 end

test/test_web.rb

@@ -17,7 +17,9 @@ describe Sidekiq::Web do
   end
 
   before do
+    ENV["RACK_ENV"] = "test"
     Sidekiq.redis {|c| c.flushdb }
+    Sidekiq::Web.middlewares.clear
   end
 
   class WebWorker
@@ -634,9 +636,8 @@ describe Sidekiq::Web do
       end
     end
   end
-end
 
-describe 'sidekiq web with basic auth' do
+  describe 'basic auth' do
     include Rack::Test::Methods
 
     def app
@@ -660,16 +661,14 @@ describe 'sidekiq web with basic auth' do
 
       assert_equal 200, last_response.status
     end
-end
+  end
 
-describe 'sidekiq web with custom session' do
+  describe 'custom session' do
     include Rack::Test::Methods
 
     def app
       app = Sidekiq::Web.new
-
       app.use Rack::Session::Cookie, secret: 'v3rys3cr31', host: 'nicehost.org'
-
       app
     end
 
@@ -741,4 +740,5 @@ describe 'sidekiq web with custom session' do
         end
       end
     end
+  end
 end