Mock RedisClient instead of Hashie

gzigzigzeo · Aug 14, 2023 · 62f26a4 · 62f26a4
1 parent 972215c
commit 62f26a4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/lib/sidekiq/grouping/redis.rb b/lib/sidekiq/grouping/redis.rb
@@ -117,7 +117,9 @@ def ns(key = nil)
       # @return [<Type>] <description>
       #
       def pluck_script
-        redis_version = Sidekiq.redis { |conn| conn.info["redis_version"] }
+        redis_version = Sidekiq.redis do |conn|
+          conn.info(:server)["redis_version"]
+        end
         if Gem::Version.new(redis_version) >= Gem::Version.new("6.2.0")
           PLUCK_SCRIPT_GTE_6_2_0
         else

diff --git a/sidekiq-grouping.gemspec b/sidekiq-grouping.gemspec
@@ -31,7 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop-rspec"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "timecop"
-  spec.add_development_dependency "hashie"
 
   spec.add_dependency "activesupport"
   spec.add_dependency "concurrent-ruby"

diff --git a/spec/modules/redis_spec.rb b/spec/modules/redis_spec.rb
@@ -45,24 +45,22 @@
   describe "#pluck_script" do
     context "when Redis version is" do
       it ">= 6.2.0, selects the corresponding pluck script" do
-        mock_redis_client = Hashie::Mash.new(
-          info: { "redis_version" => "6.2.0" }
-        )
-        allow_any_instance_of(described_class).to receive(:redis).and_yield(
-          mock_redis_client
-        )
+        allow_any_instance_of(RedisClient).to receive(:call)
+          .with(:info, anything)
+          .and_return(
+            { "redis_version" => "6.2.0" }
+          )
         expect(redis_service.pluck_script).to eq(
           described_class::PLUCK_SCRIPT_GTE_6_2_0
         )
       end
 
       it "< 6.2.0, selects the corresponding pluck script" do
-        mock_redis_client = Hashie::Mash.new(
-          info: { "redis_version" => "6.0.0" }
-        )
-        allow_any_instance_of(described_class).to receive(:redis).and_yield(
-          mock_redis_client
-        )
+        allow_any_instance_of(RedisClient).to receive(:call)
+          .with(:info, anything)
+          .and_return(
+            { "redis_version" => "6.0.0" }
+          )
         expect(redis_service.pluck_script).to eq(
           described_class::PLUCK_SCRIPT_LT_6_2_0
         )