test/pipelining_commands_test.rb in redis-3.3.5 vs test/pipelining_commands_test.rb in redis-4.0.0.rc1

@@ -1,9 +1,7 @@
-# encoding: UTF-8
+require_relative "helper"
 
-require File.expand_path("helper", File.dirname(__FILE__))
-
 class TestPipeliningCommands < Test::Unit::TestCase
 
   include Helper::Client
 
   def test_bulk_commands
@@ -134,13 +132,11 @@
     r.pipelined do
       @result = r.sadd("foo", 1)
     end
 
     assert_equal true, @result.is_a?(Redis::Future)
-    if defined?(::BasicObject)
-      assert_equal true, @result.is_a?(::BasicObject)
-    end
+    assert_equal true, @result.is_a?(::BasicObject)
     assert_equal Redis::Future, @result.class
   end
 
   def test_returning_the_result_of_an_empty_pipeline
     result = r.pipelined do
@@ -223,11 +219,11 @@
     r.select 1
     r.pipelined do |p2|
       p2.select 2
     end
 
-    assert_equal 2, r.client.db
+    assert_equal 2, r._client.db
   end
 
   def test_nested_pipeline_select_client_db
     r.select 1
     r.pipelined do |p2|
@@ -235,8 +231,8 @@
       p2.pipelined do |p3|
         p3.select 3
       end
     end
 
-    assert_equal 3, r.client.db
+    assert_equal 3, r._client.db
   end
 end