Merge pull request #1095 from petergoldstein/chore/fix-rubocop-redundant-disable

Remove redundant rubocop disable directive in test/helper.rb

Author: petergoldstein

test/helper.rb

@@ -33,7 +33,6 @@ def warn(msg, **, &)
 # Generate self-signed certs for SSL once per suite run.
 CertificateGenerator.generate
 
-# rubocop:disable Style/OneClassPerFile
 module Minitest
   class Spec
     include Memcached::Helper
@@ -77,4 +76,3 @@ def with_nil_logger
     end
   end
 end
-# rubocop:enable Style/OneClassPerFile

test/integration/test_failover.rb

@@ -95,7 +95,7 @@
 
               memcached_kill(second_port)
 
-              assert_raises Dalli::RingError, message: 'No server available' do
+              assert_error Dalli::RingError, /No server available/ do
                 dc.set 'foo', 'bar'
               end
             end

test/integration/test_network.rb

@@ -8,7 +8,7 @@
       describe 'assuming a bad network' do
         it 'handle no server available' do
           dc = Dalli::Client.new 'localhost:19333'
-          assert_raises Dalli::RingError, message: 'No server available' do
+          assert_error Dalli::RingError, /No server available/ do
             dc.get 'foo'
           end
         end
@@ -17,7 +17,7 @@
           it 'handle connection reset' do
             memcached_mock(lambda(&:close)) do
               dc = Dalli::Client.new('localhost:19123')
-              assert_raises Dalli::RingError, message: 'No server available' do
+              assert_error Dalli::RingError, /No server available/ do
                 dc.get('abc')
               end
             end
@@ -27,7 +27,7 @@
             socket_path = MemcachedMock::UNIX_SOCKET_PATH
             memcached_mock(lambda(&:close), :start_unix, socket_path) do
               dc = Dalli::Client.new(socket_path)
-              assert_raises Dalli::RingError, message: 'No server available' do
+              assert_error Dalli::RingError, /No server available/ do
                 dc.get('abc')
               end
             end
@@ -36,7 +36,7 @@
           it 'handle malformed response' do
             memcached_mock(->(sock) { sock.write('123') }) do
               dc = Dalli::Client.new('localhost:19123')
-              assert_raises Dalli::RingError, message: 'No server available' do
+              assert_error Dalli::RingError, /No server available/ do
                 dc.get('abc')
               end
             end
@@ -55,7 +55,7 @@
                              sock.close
                            }, :delayed_start) do
               dc = Dalli::Client.new('localhost:19123')
-              assert_raises Dalli::RingError, message: 'No server available' do
+              assert_error Dalli::RingError, /No server available/ do
                 dc.get('abc')
               end
             end
@@ -67,7 +67,7 @@
                              sock.write('giraffe')
                            }) do
               dc = Dalli::Client.new('localhost:19123')
-              assert_raises Dalli::RingError, message: 'No server available' do
+              assert_error Dalli::RingError, /No server available/ do
                 dc.get('abc')
               end
             end

test/test_ring.rb

@@ -16,7 +16,7 @@
 
     it 'raise when no servers are available/defined' do
       ring = Dalli::Ring.new([], {})
-      assert_raises Dalli::RingError, message: 'No server available' do
+      assert_error Dalli::RingError, /No server available/ do
         ring.server_for_key('test')
       end
     end
@@ -25,7 +25,7 @@
       it "raise correctly when it's not alive" do
         servers = ['localhost:12345']
         ring = Dalli::Ring.new(servers, {})
-        assert_raises Dalli::RingError, message: 'No server available' do
+        assert_error Dalli::RingError, /No server available/ do
           ring.server_for_key('test')
         end
       end
@@ -43,7 +43,7 @@
       it 'raise correctly when no server is alive' do
         servers = ['localhost:12345', 'localhost:12346']
         ring = Dalli::Ring.new(servers, {})
-        assert_raises Dalli::RingError, message: 'No server available' do
+        assert_error Dalli::RingError, /No server available/ do
           ring.server_for_key('test')
         end
       end