update tests to actually work right

Author: sjpotter

packages/client/lib/commands/XREAD.spec.ts

@@ -90,22 +90,32 @@ describe('XREAD', () => {
     });
   });
 
-  // TODO
-  // testUtils.testAll('client.xRead', async client => {
-  //   const message = { field: 'value' },
-  //     [, reply] = await Promise.all([
-  //       client.xAdd('key', '*', message),
-  //       client.xRead({
-  //         key: 'key',
-  //         id: '0-0'
-  //       })
-  //     ])
-  //   assert.equal(
-  //     await client.xRead({
-  //       key: 'key',
-  //       id: '0'
-  //     }),
-  //     null
-  //   );
-  // }, GLOBAL.SERVERS.OPEN);
+
+  testUtils.testAll('client.xRead', async client => {
+    const message = { field: 'value' }, 
+    [id, reply] = await Promise.all([
+      client.xAdd('key', '*', message),
+      client.xRead({
+        key: 'key',
+        id: '0-0'
+      }),
+    ])
+    assert.deepEqual(reply, [{
+        name: 'key',
+        messages: [{
+          id,
+          message: Object.create(null, {
+            field: {
+              value: 'value',
+              configurable: true,
+              enumerable: true
+            }
+          })
+        }]
+      }]
+    );
+  }, {
+    client: GLOBAL.SERVERS.OPEN,
+    cluster: GLOBAL.CLUSTERS.OPEN
+  });
 });

packages/client/lib/commands/XREADGROUP.spec.ts

@@ -94,44 +94,50 @@ describe('XREADGROUP', () => {
     });
   });
 
-  // testUtils.testAll('xReadGroup - null', async client => {
-  //   const [, readGroupReply] = await Promise.all([
-  //     client.xGroupCreate('key', 'group', '$', {
-  //       MKSTREAM: true
-  //     }),
-  //     client.xReadGroup('group', 'consumer', {
-  //       key: 'key',
-  //       id: '>'
-  //     })
-  //   ]);
+  testUtils.testAll('xReadGroup - null', async client => {
+    const [, readGroupReply] = await Promise.all([
+      client.xGroupCreate('key', 'group', '$', {
+        MKSTREAM: true
+      }),
+      client.xReadGroup('group', 'consumer', {
+        key: 'key',
+        id: '>'
+      })
+    ]);
 
-  //   assert.equal(readGroupReply, null);
-  // }, GLOBAL.SERVERS.OPEN);
+    assert.equal(readGroupReply, null);
+  }, {
+    client: GLOBAL.SERVERS.OPEN,
+    cluster: GLOBAL.CLUSTERS.OPEN
+  });
 
-  // testUtils.testAll('xReadGroup - with a message', async client => {
-  //   const [, id, readGroupReply] = await Promise.all([
-  //     client.xGroupCreate('key', 'group', '$', {
-  //       MKSTREAM: true
-  //     }),
-  //     client.xAdd('key', '*', { field: 'value' }),
-  //     client.xReadGroup('group', 'consumer', {
-  //       key: 'key',
-  //       id: '>'
-  //     })
-  //   ]);
+  testUtils.testAll('xReadGroup - with a message', async client => {
+    const [, id, readGroupReply] = await Promise.all([
+      client.xGroupCreate('key', 'group', '$', {
+        MKSTREAM: true
+      }),
+      client.xAdd('key', '*', { field: 'value' }),
+      client.xReadGroup('group', 'consumer', {
+        key: 'key',
+        id: '>'
+      })
+    ]);
 
-  //   assert.deepEqual(readGroupReply, [{
-  //     name: 'key',
-  //     messages: [{
-  //       id,
-  //       message: Object.create(null, {
-  //         field: {
-  //           value: 'value',
-  //           configurable: true,
-  //           enumerable: true
-  //         }
-  //       })
-  //     }]
-  //   }]);
-  // }, GLOBAL.SERVERS.OPEN);
+    assert.deepEqual(readGroupReply, [{
+      name: 'key',
+      messages: [{
+        id,
+        message: Object.create(null, {
+          field: {
+            value: 'value',
+            configurable: true,
+            enumerable: true
+          }
+        })
+      }]
+    }]);
+  }, {
+    client: GLOBAL.SERVERS.OPEN,
+    cluster: GLOBAL.CLUSTERS.OPEN
+  });
 });