Merge branch 'rcrdclub-master'

Fixes #83.

* rcrdclub-master:
  Add test when neither args nor kwargs are added
  Proper ZADD support - fixes #83

fakeredis.py

@@ -1296,10 +1296,10 @@ def zadd(self, name, value=None, score=None, **pairs):
             warnings.warn(DeprecationWarning(
                 "Passing 'value' and 'score' has been deprecated. "
                 "Please pass via kwargs instead."))
-        else:
-            value = list(pairs)[0]
-            score = list(pairs.values())[0]
-        self._db.setdefault(name, _ZSet())[value] = score
+            pairs = {value: score}
+        elif not pairs:
+            raise redis.RedisError("ZADD is missing kwargs param")
+        return super(FakeRedis, self).zadd(name, **pairs)
 
 
 class FakePipeline(object):

test_fakeredis.py

@@ -1825,7 +1825,8 @@ def test_lrem_return_value(self):
         self.assertEqual(self.redis.lrem('foo', 'one'), 0)
 
     def test_zadd_deprecated(self):
-        self.redis.zadd('foo', 'one', 1)
+        result = self.redis.zadd('foo', 'one', 1)
+        self.assertEqual(result, 1)
         self.assertEqual(self.redis.zrange('foo', 0, -1), [b'one'])
 
     def test_zadd_missing_required_params(self):
@@ -1835,11 +1836,19 @@ def test_zadd_missing_required_params(self):
         with self.assertRaises(redis.RedisError):
             # Missing the 'value' param.
             self.redis.zadd('foo', None, score=1)
+        with self.assertRaises(redis.RedisError):
+            self.redis.zadd('foo')
 
     def test_zadd_with_single_keypair(self):
-        self.redis.zadd('foo', bar=1)
+        result = self.redis.zadd('foo', bar=1)
+        self.assertEqual(result, 1)
         self.assertEqual(self.redis.zrange('foo', 0, -1), [b'bar'])
 
+    def test_zadd_with_multiple_keypairs(self):
+        result = self.redis.zadd('foo', bar=1, baz=9)
+        self.assertEqual(result, 2)
+        self.assertEqual(self.redis.zrange('foo', 0, -1), [b'bar', b'baz'])
+
     def test_set_nx_doesnt_set_value_twice(self):
         self.assertEqual(self.redis.set('foo', 'bar', nx=True), True)
         self.assertEqual(self.redis.set('foo', 'bar', nx=True), None)