Merge 7966db3 into 386a9cb

sds · Apr 1, 2017 · 10cd851 · 10cd851
2 parents 386a9cb + 7966db3
commit 10cd851
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/mock_redis/zset_methods.rb b/lib/mock_redis/zset_methods.rb
@@ -119,7 +119,7 @@ def zinterstore(destination, keys, options = {})
     def zrange(key, start, stop, options = {})
       with_zset_at(key) do |z|
         start = [start.to_i, -z.sorted.size].max
-        stop = [stop.to_i, -z.sorted.size].max
+        stop = stop.to_i
         to_response(z.sorted[start..stop] || [], options)
       end
     end

diff --git a/spec/commands/zrange_spec.rb b/spec/commands/zrange_spec.rb
@@ -58,6 +58,10 @@
     @redises.zrange(@key, 1, -5).should == []
   end
 
+  it 'returns empty list when start is 0 with negative end out of bounds' do
+    @redises.zrange(@key, 0, -5).should == []
+  end
+
   it 'returns correct subset when start is in bounds with negative end in bounds' do
     @redises.zrange(@key, 1, -1).should == %w[Adams Jefferson Madison]
   end