Merge pull request #808 from fintura/refactor-tests

Refactor the test suite and remove duplicated code

Author: BridgeAR

test/auth.spec.js

@@ -11,7 +11,8 @@ describe("client authentication", function () {
         });
     });
 
-    function allTests(parser, ip) {
+    helper.allTests(function(parser, ip, args) {
+
         describe("using " + parser + " and " + ip, function () {
             var args = config.configureClient(parser, ip);
             var auth = 'porkchopsandwiches';
@@ -73,13 +74,6 @@ describe("client authentication", function () {
                 });
             });
         });
-    }
-
-    ['javascript', 'hiredis'].forEach(function (parser) {
-        allTests(parser, "/tmp/redis.sock");
-        ['IPv4', 'IPv6'].forEach(function (ip) {
-            allTests(parser, ip);
-        })
     });
 
     after(function (done) {

test/commands/blpop.spec.js

@@ -5,8 +5,7 @@ var redis = config.redis;
 
 describe("The 'blpop' method", function () {
 
-    function allTests(parser, ip) {
-        var args = config.configureClient(parser, ip);
+    helper.allTests(function(parser, ip, args) {
 
         describe("using " + parser + " and " + ip, function () {
             var client;
@@ -53,12 +52,5 @@ describe("The 'blpop' method", function () {
                 bclient.end();
             });
         });
-    }
-
-    ['javascript', 'hiredis'].forEach(function (parser) {
-        allTests(parser, "/tmp/redis.sock");
-        ['IPv4', 'IPv6'].forEach(function (ip) {
-            allTests(parser, ip);
-        })
     });
 });

test/commands/client.spec.js

@@ -5,8 +5,7 @@ var redis = config.redis;
 
 describe("The 'client' method", function () {
 
-    function allTests(parser, ip) {
-        var args = config.configureClient(parser, ip);
+    helper.allTests(function(parser, ip, args) {
         var pattern = /addr=/;
 
         describe("using " + parser + " and " + ip, function () {
@@ -50,12 +49,5 @@ describe("The 'client' method", function () {
                 });
             });
         });
-    }
-
-    ['javascript', 'hiredis'].forEach(function (parser) {
-        allTests(parser, "/tmp/redis.sock");
-        ['IPv4', 'IPv6'].forEach(function (ip) {
-            allTests(parser, ip);
-        })
     });
 });

test/commands/dbsize.spec.js

@@ -7,8 +7,7 @@ var uuid = require('uuid');
 
 describe("The 'dbsize' method", function () {
 
-    function allTests(parser, ip) {
-        var args = config.configureClient(parser, ip);
+    helper.allTests(function(parser, ip, args) {
 
         describe("using " + parser + " and " + ip, function () {
             var key, value;
@@ -95,12 +94,5 @@ describe("The 'dbsize' method", function () {
                 });
             });
         });
-    }
-
-    ['javascript', 'hiredis'].forEach(function (parser) {
-        allTests(parser, "/tmp/redis.sock");
-        ['IPv4', 'IPv6'].forEach(function (ip) {
-            allTests(parser, ip);
-        })
     });
 });

test/commands/del.spec.js

@@ -5,8 +5,7 @@ var redis = config.redis;
 
 describe("The 'del' method", function () {
 
-    function allTests(parser, ip) {
-        var args = config.configureClient(parser, ip);
+    helper.allTests(function(parser, ip, args) {
 
         describe("using " + parser + " and " + ip, function () {
             var client;
@@ -40,12 +39,5 @@ describe("The 'del' method", function () {
                 client.end();
             });
         });
-    }
-
-    ['javascript', 'hiredis'].forEach(function (parser) {
-        allTests(parser, "/tmp/redis.sock");
-        ['IPv4', 'IPv6'].forEach(function (ip) {
-            allTests(parser, ip);
-        })
     });
 });

test/commands/eval.spec.js

@@ -5,8 +5,8 @@ var helper = require("../helper");
 var redis = config.redis;
 
 describe("The 'eval' method", function () {
-    function allTests(parser, ip) {
-        var args = config.configureClient(parser, ip);
+
+    helper.allTests(function(parser, ip, args) {
 
         describe("using " + parser + " and " + ip, function () {
             var client;
@@ -188,12 +188,5 @@ describe("The 'eval' method", function () {
                 });
             });
         });
-    }
-
-    ['javascript', 'hiredis'].forEach(function (parser) {
-        allTests(parser, "/tmp/redis.sock");
-        ['IPv4', 'IPv6'].forEach(function (ip) {
-            allTests(parser, ip);
-        })
     });
 });

test/commands/exits.spec.js

@@ -5,8 +5,7 @@ var redis = config.redis;
 
 describe("The 'exits' method", function () {
 
-    function allTests(parser, ip) {
-        var args = config.configureClient(parser, ip);
+    helper.allTests(function(parser, ip, args) {
 
         describe("using " + parser + " and " + ip, function () {
             var client;
@@ -32,12 +31,5 @@ describe("The 'exits' method", function () {
                 client.end();
             });
         });
-    }
-
-    ['javascript', 'hiredis'].forEach(function (parser) {
-        allTests(parser, "/tmp/redis.sock");
-        ['IPv4', 'IPv6'].forEach(function (ip) {
-            allTests(parser, ip);
-        })
     });
 });

test/commands/expire.spec.js

@@ -5,8 +5,7 @@ var redis = config.redis;
 
 describe("The 'expire' method", function () {
 
-    function allTests(parser, ip) {
-        var args = config.configureClient(parser, ip);
+    helper.allTests(function(parser, ip, args) {
 
         describe("using " + parser + " and " + ip, function () {
             var client;
@@ -31,12 +30,5 @@ describe("The 'expire' method", function () {
                 client.end();
             });
         });
-    }
-
-    ['javascript', 'hiredis'].forEach(function (parser) {
-        allTests(parser, "/tmp/redis.sock");
-        ['IPv4', 'IPv6'].forEach(function (ip) {
-            allTests(parser, ip);
-        })
     });
 });

test/commands/flushdb.spec.js

@@ -7,8 +7,7 @@ var uuid = require('uuid');
 
 describe("The 'flushdb' method", function () {
 
-    function allTests(parser, ip) {
-        var args = config.configureClient(parser, ip);
+    helper.allTests(function(parser, ip, args) {
 
         describe("using " + parser + " and " + ip, function () {
             var key, key2;
@@ -104,12 +103,5 @@ describe("The 'flushdb' method", function () {
                 });
             });
         });
-    }
-
-    ['javascript', 'hiredis'].forEach(function (parser) {
-        allTests(parser, "/tmp/redis.sock");
-        ['IPv4', 'IPv6'].forEach(function (ip) {
-            allTests(parser, ip);
-        })
     });
 });

test/commands/get.spec.js

@@ -7,8 +7,7 @@ var uuid = require('uuid');
 
 describe("The 'get' method", function () {
 
-    function allTests(parser, ip) {
-        var args = config.configureClient(parser, ip);
+    helper.allTests(function(parser, ip, args) {
 
         describe("using " + parser + " and " + ip, function () {
             var key, value;
@@ -81,12 +80,5 @@ describe("The 'get' method", function () {
                 });
             });
         });
-    }
-
-    ['javascript', 'hiredis'].forEach(function (parser) {
-        allTests(parser, "/tmp/redis.sock");
-        ['IPv4', 'IPv6'].forEach(function (ip) {
-            allTests(parser, ip);
-        })
     });
 });