From d55017a01e81923ce243525657ed9a0f2f9c0bad Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben.bridgewater@fintura.de>
Date: Mon, 23 Nov 2015 23:11:31 +0100
Subject: [PATCH] Use .end(true) to stricten test cases and improve coverage

---
 test/batch.spec.js          |  2 +-
 test/detect_buffers.spec.js |  2 +-
 test/multi.spec.js          |  2 +-
 test/node_redis.spec.js     | 28 ++++++++++++++++++++++++++--
 test/pubsub.spec.js         |  4 ++--
 test/rename.spec.js         |  5 +++--
 test/return_buffers.spec.js |  4 ++--
 test/tls.spec.js            |  2 +-
 8 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/test/batch.spec.js b/test/batch.spec.js
index 9afc7973e9..575544fe99 100644
--- a/test/batch.spec.js
+++ b/test/batch.spec.js
@@ -60,7 +60,7 @@ describe("The 'batch' method", function () {
                 });
 
                 afterEach(function () {
-                    client.end();
+                    client.end(true);
                 });
 
                 it("returns an empty array", function (done) {
diff --git a/test/detect_buffers.spec.js b/test/detect_buffers.spec.js
index b1decc3aab..c8f0f134d8 100644
--- a/test/detect_buffers.spec.js
+++ b/test/detect_buffers.spec.js
@@ -28,7 +28,7 @@ describe("detect_buffers", function () {
             });
 
             afterEach(function () {
-                client.end();
+                client.end(true);
             });
 
             describe('get', function () {
diff --git a/test/multi.spec.js b/test/multi.spec.js
index 25cbfa538b..d4f0250200 100644
--- a/test/multi.spec.js
+++ b/test/multi.spec.js
@@ -11,7 +11,7 @@ var client;
 describe("The 'multi' method", function () {
 
     afterEach(function () {
-        client.end();
+        client.end(true);
     });
 
     describe('regression test', function () {
diff --git a/test/node_redis.spec.js b/test/node_redis.spec.js
index f8d91962d8..03098115d9 100644
--- a/test/node_redis.spec.js
+++ b/test/node_redis.spec.js
@@ -96,6 +96,30 @@ describe("The node_redis client", function () {
                             done();
                         });
                     });
+
+                    it('safe strings that are bigger than 30000 characters with multi', function(done) {
+                        var str = 'foo ಠ_ಠ bar ';
+                        while (str.length < 111111) {
+                            str += str;
+                        }
+                        var called = false;
+                        var temp = client.writeBuffers.bind(client);
+                        assert(String(client.writeBuffers) !== String(client.writeDefault));
+                        client.writeBuffers = function (data) {
+                            called = true;
+                            // To increase write performance for strings the value is converted to a buffer
+                            assert(String(client.writeBuffers) === String(client.writeDefault));
+                            temp(data);
+                        };
+                        client.multi().set('foo', str).get('foo', function (err, res) {
+                            assert.strictEqual(res, str);
+                        }).exec(function (err, res) {
+                            assert(called);
+                            assert.strictEqual(res[1], str);
+                            done();
+                        });
+                        assert(String(client.writeBuffers) !== String(client.writeDefault));
+                    });
                 });
 
                 describe("send_command", function () {
@@ -135,7 +159,7 @@ describe("The node_redis client", function () {
 
                 describe(".end", function () {
 
-                    it('used without flush', function(done) {
+                    it('used without flush / flush set to false', function(done) {
                         var finished = false;
                         var end = helper.callFuncAfter(function() {
                             if (!finished) {
@@ -513,7 +537,7 @@ describe("The node_redis client", function () {
                             client.retry_backoff = 1;
                             client.stream.end();
                         } else {
-                            client.end();
+                            client.end(true);
                             var lasted = new Date().getTime() - time;
                             assert.ok(lasted < 100);
                             return done();
diff --git a/test/pubsub.spec.js b/test/pubsub.spec.js
index 545f85b6c8..e67b019462 100644
--- a/test/pubsub.spec.js
+++ b/test/pubsub.spec.js
@@ -367,8 +367,8 @@ describe("publish/subscribe", function () {
             });
 
             afterEach(function () {
-                sub.end();
-                pub.end();
+                sub.end(true);
+                pub.end(true);
             });
         });
     });
diff --git a/test/rename.spec.js b/test/rename.spec.js
index fe4b3b5099..5ac7435138 100644
--- a/test/rename.spec.js
+++ b/test/rename.spec.js
@@ -22,7 +22,8 @@ describe("rename commands", function () {
                     rename_commands: {
                         set: '807081f5afa96845a02816a28b7258c3',
                         GETRANGE: '9e3102b15cf231c4e9e940f284744fe0'
-                    }
+                    },
+                    parser: parser
                 });
 
                 client.on('ready', function () {
@@ -31,7 +32,7 @@ describe("rename commands", function () {
             });
 
             afterEach(function () {
-                client.end();
+                client.end(true);
             });
 
             it("allows to use renamed functions", function (done) {
diff --git a/test/return_buffers.spec.js b/test/return_buffers.spec.js
index a89ecbe34d..3258284307 100644
--- a/test/return_buffers.spec.js
+++ b/test/return_buffers.spec.js
@@ -277,8 +277,8 @@ describe("return_buffers", function () {
                 });
 
                 afterEach(function () {
-                    sub.end();
-                    pub.end();
+                    sub.end(true);
+                    pub.end(true);
                 });
             });
         });
diff --git a/test/tls.spec.js b/test/tls.spec.js
index 8c093af1e3..68d12d761c 100644
--- a/test/tls.spec.js
+++ b/test/tls.spec.js
@@ -126,7 +126,7 @@ describe("TLS connection tests", function () {
                     });
 
                     client.on("reconnecting", function (params) {
-                        client.end();
+                        client.end(true);
                         setTimeout(done, 100);
                     });
                 });