From 9c6c63c167fb14a25f5fb790faf1b0a86654d62a Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Wed, 15 Jul 2015 15:03:28 +0200
Subject: [PATCH] More strict jshint

---
 .jshintrc                                     |   4 +-
 lib/cartodb/api/auth_api.js                   |   2 +-
 lib/cartodb/backends/pg_connection.js         |  10 +-
 lib/cartodb/backends/template_maps.js         |  26 +-
 lib/cartodb/controllers/layergroup.js         |   2 -
 lib/cartodb/controllers/named_maps_admin.js   |   4 +-
 .../models/mapconfig/named_map_provider.js    |   2 +-
 test/acceptance/multilayer.js                 | 261 +++++++----
 test/acceptance/server.js                     |   2 +-
 test/acceptance/templates.js                  | 434 ++++++++++++------
 test/unit/cartodb/template_maps.test.js       |  76 +--
 11 files changed, 540 insertions(+), 283 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index f03eef65..8972be0b 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -7,8 +7,8 @@
 //    // Enforcing
 //    "bitwise"       : true,     // true: Prohibit bitwise operators (&, |, ^, etc.)
 //    "camelcase"     : false,    // true: Identifiers must be in camelCase
-//    "curly"         : true,     // true: Require {} for every new block or scope
-//    "eqeqeq"        : true,     // true: Require triple equals (===) for comparison
+    "curly"         : true,     // true: Require {} for every new block or scope
+    "eqeqeq"        : true,     // true: Require triple equals (===) for comparison
     "forin"         : true,     // true: Require filtering for..in loops with obj.hasOwnProperty()
     "freeze"        : true,     // true: prohibits overwriting prototypes of native objects such as Array, Date etc.
     "immed"         : true,    // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
diff --git a/lib/cartodb/api/auth_api.js b/lib/cartodb/api/auth_api.js
index 5b20cbf4..68533fe9 100644
--- a/lib/cartodb/api/auth_api.js
+++ b/lib/cartodb/api/auth_api.js
@@ -72,7 +72,7 @@ AuthApi.prototype.authorizedByAPIKey = function(user, req, callback) {
         },
         function checkApiKey(err, val){
             assert.ifError(err);
-            return val && givenKey == val;
+            return val && givenKey === val;
         },
         function finish(err, authorized) {
             callback(err, authorized);
diff --git a/lib/cartodb/backends/pg_connection.js b/lib/cartodb/backends/pg_connection.js
index 6cc432fb..2ca56f5b 100644
--- a/lib/cartodb/backends/pg_connection.js
+++ b/lib/cartodb/backends/pg_connection.js
@@ -37,7 +37,9 @@ PgConnection.prototype.setDBAuth = function(username, params, callback) {
 
             // skip looking up user_password if postgres_auth_pass
             // doesn't contain the "user_password" label
-            if (!auth_pass || ! auth_pass.match(/\buser_password\b/) ) return null;
+            if (!auth_pass || ! auth_pass.match(/\buser_password\b/) ) {
+                return null;
+            }
 
             self.metadataBackend.getUserDBPass(username, this);
         },
@@ -84,10 +86,12 @@ PgConnection.prototype.setDBConn = function(dbowner, params, callback) {
         function extendParams(err, dbParams){
             assert.ifError(err);
             // we don't want null values or overwrite a non public user
-            if (params.dbuser != 'publicuser' || !dbParams.dbuser) {
+            if (params.dbuser !== 'publicuser' || !dbParams.dbuser) {
                 delete dbParams.dbuser;
             }
-            if ( dbParams ) _.extend(params, dbParams);
+            if ( dbParams ) {
+                _.extend(params, dbParams);
+            }
             return null;
         },
         function finish(err) {
diff --git a/lib/cartodb/backends/template_maps.js b/lib/cartodb/backends/template_maps.js
index 544bdf1f..b550cb53 100644
--- a/lib/cartodb/backends/template_maps.js
+++ b/lib/cartodb/backends/template_maps.js
@@ -22,7 +22,9 @@ var util = require('util');
 //
 // 
 function TemplateMaps(redis_pool, opts) {
-  if (!(this instanceof TemplateMaps)) return new TemplateMaps();
+  if (!(this instanceof TemplateMaps)) {
+      return new TemplateMaps();
+  }
 
   EventEmitter.call(this);
 
@@ -83,7 +85,9 @@ o._redisCmd = function(redisFunc, redisArgs, callback) {
       redisClient[redisFunc.toUpperCase()].apply(redisClient, redisArgs);
     },
     function releaseRedisClient(err, data) {
-      if ( ! _.isUndefined(redisClient) ) that.redis_pool.release(db, redisClient);
+      if ( ! _.isUndefined(redisClient) ) {
+          that.redis_pool.release(db, redisClient);
+      }
       callback(err, data);
     }
   );
@@ -93,7 +97,7 @@ var _reValidNameIdentifier = /^[a-z0-9][0-9a-z_\-]*$/i;
 var _reValidPlaceholderIdentifier = /^[a-z][0-9a-z_]*$/i;
 // jshint maxcomplexity:15
 o._checkInvalidTemplate = function(template) {
-  if ( template.version != '0.0.1' ) {
+  if ( template.version !== '0.0.1' ) {
     return new Error("Unsupported template version " + template.version);
   }
   var tplname = template.name;
@@ -132,10 +136,12 @@ o._checkInvalidTemplate = function(template) {
         case 'open':
             break;
         case 'token':
-            if ( ! _.isArray(auth.valid_tokens) )
+            if ( ! _.isArray(auth.valid_tokens) ) {
                 return new Error("Invalid 'token' authentication: missing valid_tokens");
-            if ( ! auth.valid_tokens.length )
+            }
+            if ( ! auth.valid_tokens.length ) {
                 return new Error("Invalid 'token' authentication: no valid_tokens");
+            }
             break;
         default:
             return new Error("Unsupported authentication method: " + auth.method);
@@ -301,7 +307,7 @@ o.updTemplate = function(owner, tpl_id, template, callback) {
 
     var templateName = template.name;
 
-    if ( tpl_id != templateName ) {
+    if ( tpl_id !== templateName ) {
         return callback(new Error("Cannot update name of a map template ('" + tpl_id + "' != '" + templateName + "')"));
     }
 
@@ -463,8 +469,12 @@ o.instance = function(template, params) {
   var layergroup = JSON.parse(JSON.stringify(template.layergroup));
   for (var i=0; i<layergroup.layers.length; ++i) {
     var lyropt = layergroup.layers[i].options;
-    if ( lyropt.cartocss ) lyropt.cartocss = _replaceVars(lyropt.cartocss, all_params);
-    if ( lyropt.sql) lyropt.sql = _replaceVars(lyropt.sql, all_params);
+    if ( lyropt.cartocss ) {
+        lyropt.cartocss = _replaceVars(lyropt.cartocss, all_params);
+    }
+    if ( lyropt.sql) {
+        lyropt.sql = _replaceVars(lyropt.sql, all_params);
+    }
     // Anything else ?
   }
 
diff --git a/lib/cartodb/controllers/layergroup.js b/lib/cartodb/controllers/layergroup.js
index 0d932008..dfcc5ccf 100644
--- a/lib/cartodb/controllers/layergroup.js
+++ b/lib/cartodb/controllers/layergroup.js
@@ -29,8 +29,6 @@ function LayergroupController(app, mapStore, tileBackend, previewBackend, attrib
     this.userLimitsApi = userLimitsApi;
     this.queryTablesApi = queryTablesApi;
     this.layergroupAffectedTables = layergroupAffectedTables;
-
-    this.channelCache = {};
 }
 
 module.exports = LayergroupController;
diff --git a/lib/cartodb/controllers/named_maps_admin.js b/lib/cartodb/controllers/named_maps_admin.js
index e0b9c035..f2fb1c8a 100644
--- a/lib/cartodb/controllers/named_maps_admin.js
+++ b/lib/cartodb/controllers/named_maps_admin.js
@@ -101,7 +101,7 @@ NamedMapsAdminController.prototype.retrieve = function(req, res) {
             self.templateMaps.getTemplate(cdbuser, tpl_id, this);
         },
         function prepareResponse(err, tpl_val) {
-            if ( err ) throw err;
+            assert.ifError(err);
             if ( ! tpl_val ) {
                 err = new Error("Cannot find template '" + tpl_id + "' of user '" + cdbuser + "'");
                 err.http_status = 404;
@@ -137,7 +137,7 @@ NamedMapsAdminController.prototype.destroy = function(req, res) {
             self.templateMaps.delTemplate(cdbuser, tpl_id, this);
         },
         function prepareResponse(err/*, tpl_val*/){
-            if ( err ) throw err;
+            assert.ifError(err);
             return { status: 'ok' };
         },
         finishFn(self.app, res, 'DELETE TEMPLATE', ['', 204])
diff --git a/lib/cartodb/models/mapconfig/named_map_provider.js b/lib/cartodb/models/mapconfig/named_map_provider.js
index 59aa1708..f1565c66 100644
--- a/lib/cartodb/models/mapconfig/named_map_provider.js
+++ b/lib/cartodb/models/mapconfig/named_map_provider.js
@@ -193,7 +193,7 @@ NamedMapMapConfigProvider.prototype.setDBParams = function(cdbuser, params, call
             self.pgConnection.setDBAuth(cdbuser, params, this);
         },
         function setConn(err) {
-            if ( err ) throw err;
+            assert.ifError(err);
             self.pgConnection.setDBConn(cdbuser, params, this);
         },
         function finish(err) {
diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js
index fb04eb07..17609b9c 100644
--- a/test/acceptance/multilayer.js
+++ b/test/acceptance/multilayer.js
@@ -76,7 +76,7 @@ suite(suiteName, function() {
         },
         function do_get_tile(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + ':cb0/0/0/0.png',
@@ -121,7 +121,7 @@ suite(suiteName, function() {
         // See https://github.com/CartoDB/Windshaft-cartodb/issues/170
         function do_get_tile_nosignature(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + '/localhost@' + expected_token + ':cb0/0/0/0.png',
@@ -138,7 +138,7 @@ suite(suiteName, function() {
         },
         function do_get_grid_layer0(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + '/0/0/0/0.grid.json',
@@ -155,7 +155,7 @@ suite(suiteName, function() {
         },
         function do_get_grid_layer1(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + '/1/0/0/0.grid.json',
@@ -177,12 +177,20 @@ suite(suiteName, function() {
             console.log("Error: " + err);
           }
           redis_client.keys("map_cfg|" + expected_token, function(err, matches) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               assert.equal(matches.length, 1, "Missing expected token " + expected_token + " from redis: " + matches);
               redis_client.del(matches, function(err) {
-                if ( err ) errors.push(err.message);
-                if ( errors.length ) done(new Error(errors));
-                else done(null);
+                if ( err ) {
+                    errors.push(err.message);
+                }
+                if ( errors.length ) {
+                    done(new Error(errors));
+                }
+                else {
+                    done(null);
+                }
               });
           });
         }
@@ -255,7 +263,7 @@ suite(suiteName, function() {
           }, {}, function(res, err) { next(err, res); });
         },
         function do_check_create(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsedBody = JSON.parse(res.body);
           expected_token = parsedBody.layergroupid.split(':')[0];
@@ -273,12 +281,20 @@ suite(suiteName, function() {
             console.log("Error: " + err);
           }
           redis_client.keys("map_cfg|" + expected_token, function(err, matches) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               assert.equal(matches.length, 1, "Missing expected token " + expected_token + " from redis: " + matches);
               redis_client.del(matches, function(err) {
-                if ( err ) errors.push(err.message);
-                if ( errors.length ) done(new Error(errors));
-                else done(null);
+                if ( err ) {
+                    errors.push(err.message);
+                }
+                if ( errors.length ) {
+                    done(new Error(errors));
+                }
+                else {
+                    done(null);
+                }
               });
           });
         }
@@ -362,13 +378,15 @@ suite(suiteName, function() {
               if ( expected_token ) {
                 assert.equal(parsedBody.layergroupid, expected_token + ':' + expected_last_updated_epoch);
               }
-              else expected_token = parsedBody.layergroupid.split(':')[0];
+              else {
+                  expected_token = parsedBody.layergroupid.split(':')[0];
+              }
               next(null, res);
           });
         },
         function do_get_tile1(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + ':cb10/1/0/0.png',
@@ -407,7 +425,7 @@ suite(suiteName, function() {
         },
         function do_get_tile4(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + ':cb11/4/0/0.png',
@@ -446,7 +464,7 @@ suite(suiteName, function() {
         },
         function do_get_grid1(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + '/0/1/0/0.grid.json',
@@ -463,7 +481,7 @@ suite(suiteName, function() {
         },
         function do_get_grid4(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + '/0/4/0/0.grid.json',
@@ -485,12 +503,20 @@ suite(suiteName, function() {
             console.log("Error: " + err);
           }
           redis_client.keys("map_cfg|" + expected_token, function(err, matches) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               assert.equal(matches.length, 1, "Missing expected token " + expected_token + " from redis: " + matches);
               redis_client.del(matches, function(err) {
-                if ( err ) errors.push(err.message);
-                if ( errors.length ) done(new Error(errors));
-                else done(null);
+                if ( err ) {
+                    errors.push(err.message);
+                }
+                if ( errors.length ) {
+                    done(new Error(errors));
+                }
+                else {
+                    done(null);
+                }
               });
           });
         }
@@ -520,13 +546,17 @@ suite(suiteName, function() {
         {
           var next = this;
           redis_stats_client.select(redis_stats_db, function(err) {
-            if ( err ) next(err);
-            else redis_stats_client.del(statskey+':global', next);
+            if ( err ) {
+                next(err);
+            }
+            else {
+                redis_stats_client.del(statskey+':global', next);
+            }
           });
         },
         function do_post_1(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url,
@@ -540,12 +570,12 @@ suite(suiteName, function() {
           });
         },
         function check_global_stats_1(err, val) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(val, 1, "Expected score of " + now + " in " + statskey + ":global to be 1, got " + val);
           redis_stats_client.zscore(statskey+':stat_tag:random_tag', now, this);
         },
         function check_tag_stats_1_do_post_2(err, val) {
-          if ( err ) throw err;
+          assert.ifError(err);
           assert.equal(val, 1, "Expected score of " + now + " in " + statskey + ":stat_tag:" + layergroup.stat_tag +
               " to be 1, got " + val);
           var next = this;
@@ -562,19 +592,21 @@ suite(suiteName, function() {
         },
         function check_global_stats_2(err, val)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(val, 2, "Expected score of " + now + " in " +  statskey + ":global to be 2, got " + val);
           redis_stats_client.zscore(statskey+':stat_tag:' + layergroup.stat_tag, now, this);
         },
         function check_tag_stats_2(err, val)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(val, 2, "Expected score of " + now + " in " + statskey + ":stat_tag:" + layergroup.stat_tag +
               " to be 2, got " + val);
           return 1;
         },
         function cleanup_map_style(err) {
-          if ( err ) errors.push('' + err);
+          if ( err ) {
+              errors.push('' + err);
+          }
           var next = this;
           // trip epoch
           expected_token = expected_token.split(':')[0];
@@ -583,13 +615,21 @@ suite(suiteName, function() {
           });
         },
         function cleanup_stats(err) {
-          if ( err ) errors.push('' + err);
+          if ( err ) {
+              errors.push('' + err);
+          }
           redis_client.del([statskey+':global', statskey+':stat_tag:'+layergroup.stat_tag], this);
         },
         function finish(err) {
-          if ( err ) errors.push('' + err);
-          if ( errors.length ) done(new Error(errors.join(',')));
-          else done(null);
+          if ( err ) {
+              errors.push('' + err);
+          }
+          if ( errors.length ) {
+              done(new Error(errors.join(',')));
+          }
+          else {
+              done(null);
+          }
         }
       );
     });
@@ -687,13 +727,15 @@ suite(suiteName, function() {
               if ( expected_token ) {
                 assert.equal(parsedBody.layergroupid, expected_token + ':' + expected_last_updated_epoch);
               }
-              else expected_token = parsedBody.layergroupid.split(':')[0];
+              else {
+                  expected_token = parsedBody.layergroupid.split(':')[0];
+              }
               next(null, res);
           });
         },
         function do_get_tile(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + ':cb0/0/0/0.png?map_key=1234',
@@ -714,7 +756,7 @@ suite(suiteName, function() {
         },
         function do_get_grid_layer0(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + '/0/0/0/0.grid.json?map_key=1234',
@@ -727,7 +769,7 @@ suite(suiteName, function() {
         },
         function do_get_grid_layer1(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + '/1/0/0/0.grid.json?map_key=1234',
@@ -741,7 +783,7 @@ suite(suiteName, function() {
         },
         function do_get_tile_unauth(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + ':cb0/0/0/0.png',
@@ -757,7 +799,7 @@ suite(suiteName, function() {
         },
         function do_get_grid_layer0_unauth(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + '/0/0/0/0.grid.json',
@@ -772,7 +814,7 @@ suite(suiteName, function() {
         },
         function do_get_grid_layer1_unauth(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + '/1/0/0/0.grid.json',
@@ -792,12 +834,20 @@ suite(suiteName, function() {
             console.log("Error: " + err);
           }
           redis_client.keys("map_cfg|" + expected_token, function(err, matches) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               assert.equal(matches.length, 1, "Missing expected token " + expected_token + " from redis: " + matches);
               redis_client.del(matches, function(err) {
-                if ( err ) errors.push(err.message);
-                if ( errors.length ) done(new Error(errors));
-                else done(null);
+                if ( err ) {
+                    errors.push(err.message);
+                }
+                if ( errors.length ) {
+                    done(new Error(errors));
+                }
+                else {
+                    done(null);
+                }
               });
           });
         }
@@ -832,19 +882,21 @@ suite(suiteName, function() {
           }, {}, function(res, err) { next(err, res); });
         },
         function check_post(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsedBody = JSON.parse(res.body);
           assert.equal(parsedBody.last_updated, expected_last_updated);
           if ( expected_token ) {
             assert.equal(parsedBody.layergroupid, expected_token + ':' + expected_last_updated_epoch);
           }
-          else expected_token = parsedBody.layergroupid.split(':')[0];
+          else {
+              expected_token = parsedBody.layergroupid.split(':')[0];
+          }
           return null;
         },
         function do_get0(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + ':cb0/0/0/0.png?map_key=1234',
@@ -854,7 +906,7 @@ suite(suiteName, function() {
           }, {}, function(res, err) { next(err, res); });
         },
         function do_check0(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           assert.equal(res.headers['content-type'], "image/png");
 
@@ -866,14 +918,14 @@ suite(suiteName, function() {
           return null;
         },
         function do_restart_server(err/*, res*/) {
-          if ( err ) throw err;
+            assert.ifError(err);
           // hack simulating restart...
           server = new CartodbWindshaft(serverOptions);
           return null;
         },
         function do_get1(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + ':cb0/0/0/0.png?map_key=1234',
@@ -883,7 +935,7 @@ suite(suiteName, function() {
           }, {}, function(res, err) { next(err, res); });
         },
         function do_check1(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           assert.equal(res.headers['content-type'], "image/png");
 
@@ -901,12 +953,20 @@ suite(suiteName, function() {
             console.log("Error: " + err);
           }
           redis_client.keys("map_cfg|" + expected_token, function(err, matches) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               assert.equal(matches.length, 1, "Missing expected token " + expected_token + " from redis: " + matches);
               redis_client.del(matches, function(err) {
-                if ( err ) errors.push(err.message);
-                if ( errors.length ) done(new Error(errors.join(',')));
-                else done(null);
+                if ( err ) {
+                    errors.push(err.message);
+                }
+                if ( errors.length ) {
+                    done(new Error(errors.join(',')));
+                }
+                else {
+                    done(null);
+                }
               });
           });
         }
@@ -1033,7 +1093,7 @@ suite(suiteName, function() {
         },
         function do_get_tile(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + ':cb0/0/0/0.png',
@@ -1057,12 +1117,20 @@ suite(suiteName, function() {
             console.log("Error: " + err);
           }
           redis_client.keys("map_cfg|" + expected_token, function(err, matches) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               assert.equal(matches.length, 1, "Missing expected token " + expected_token + " from redis: " + matches);
               redis_client.del(matches, function(err) {
-                if ( err ) errors.push(err.message);
-                if ( errors.length ) done(new Error(errors));
-                else done(null);
+                if ( err ) {
+                    errors.push(err.message);
+                }
+                if ( errors.length ) {
+                    done(new Error(errors));
+                }
+                else {
+                    done(null);
+                }
               });
           });
         }
@@ -1096,7 +1164,7 @@ suite(suiteName, function() {
           }, {}, function(res) { next(null, res); });
         },
         function check_result(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.equal(res.statusCode, 200, res.statusCode + ': ' + res.body);
           var parsedBody = JSON.parse(res.body);
@@ -1113,7 +1181,7 @@ suite(suiteName, function() {
         },
         function do_get_tile(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var next = this;
           assert.response(server, {
               url: layergroup_url + "/" + expected_token + ':cb0/0/0/0.png?api_key=1234',
@@ -1123,19 +1191,27 @@ suite(suiteName, function() {
           }, {}, function(res) { next(null, res); });
         },
         function check_get_tile(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           return null;
         },
         function cleanup(err) {
-          if ( err ) errors.push(err.message);
-          if ( ! expected_token ) return null;
+          if ( err ) {
+              errors.push(err.message);
+          }
+          if ( ! expected_token ) {
+              return null;
+          }
           var next = this;
           redis_client.keys("map_cfg|" + expected_token, function(err, matches) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               assert.equal(matches.length, 1, "Missing expected token " + expected_token + " from redis: " + matches);
               redis_client.del(matches, function(err) {
-                if ( err ) errors.push(err.message);
+                if ( err ) {
+                    errors.push(err.message);
+                }
                 next();
               });
           });
@@ -1145,8 +1221,12 @@ suite(suiteName, function() {
             errors.push(err.message);
             console.log("Error: " + err);
           }
-          if ( errors.length ) done(new Error(errors));
-          else done(null);
+          if ( errors.length ) {
+              done(new Error(errors));
+          }
+          else {
+              done(null);
+          }
         }
       );
     });
@@ -1155,11 +1235,14 @@ suite(suiteName, function() {
     // See https://github.com/CartoDB/Windshaft-cartodb/issues/111
     test("sql string can be very long", function(done){
       var long_val = 'pretty';
-      for (var i=0; i<1024; ++i) long_val += ' long';
+      for (var i=0; i<1024; ++i) {
+          long_val += ' long';
+      }
       long_val += ' string';
       var sql = "SELECT ";
-      for (i=0; i<16; ++i)
+      for (i=0; i<16; ++i) {
         sql += "'" + long_val + "'::text as pretty_long_field_name_" + i + ", ";
+      }
       sql += "cartodb_id, the_geom_webmercator FROM gadm4 g";
       var layergroup =  {
         version: '1.0.0',
@@ -1187,7 +1270,7 @@ suite(suiteName, function() {
           }, {}, function(res) { next(null, res); });
         },
         function check_result(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.statusCode + ': ' + res.body);
           var parsedBody = JSON.parse(res.body);
           var token_components = parsedBody.layergroupid.split(':');
@@ -1195,22 +1278,36 @@ suite(suiteName, function() {
           return null;
         },
         function cleanup(err) {
-          if ( err ) errors.push('' + err);
-          if ( ! expected_token ) return null;
+          if ( err ) {
+              errors.push('' + err);
+          }
+          if ( ! expected_token ) {
+              return null;
+          }
           var next = this;
           redis_client.keys("map_cfg|" + expected_token, function(err, matches) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               assert.equal(matches.length, 1, "Missing expected token " + expected_token + " from redis: " + matches);
               redis_client.del(matches, function(err) {
-                if ( err ) errors.push(err.message);
+                if ( err ) {
+                    errors.push(err.message);
+                }
                 next();
               });
           });
         },
         function finish(err) {
-          if ( err ) errors.push('' + err);
-          if ( errors.length ) done(new Error(errors.join(',')));
-          else done(null);
+          if ( err ) {
+              errors.push('' + err);
+          }
+          if ( errors.length ) {
+              done(new Error(errors.join(',')));
+          }
+          else {
+              done(null);
+          }
         }
       );
     });
@@ -1241,7 +1338,7 @@ suite(suiteName, function() {
           }, {}, function(res, err) { next(err, res); });
         },
         function check_post(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 400, res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.errors, 'Missing "errors" in response: ' + JSON.stringify(parsed));
@@ -1283,7 +1380,7 @@ suite(suiteName, function() {
           }, {}, function(res, err) { next(err, res); });
         },
         function check_post(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 400, res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.errors, 'Missing "errors" in response: ' + JSON.stringify(parsed));
diff --git a/test/acceptance/server.js b/test/acceptance/server.js
index a9fa2e35..326e0329 100644
--- a/test/acceptance/server.js
+++ b/test/acceptance/server.js
@@ -23,7 +23,7 @@ suite('server', function() {
           },{}, function(res, err) { next(err,res); });
         },
         function doCheck(err, res) {
-          if ( err ) throw err;
+          assert.ifError(err);
           assert.ok(res.statusCode, 200);
           var cc = res.headers['x-cache-channel'];
           assert.ok(!cc);
diff --git a/test/acceptance/templates.js b/test/acceptance/templates.js
index 1f3e4df5..925a6974 100644
--- a/test/acceptance/templates.js
+++ b/test/acceptance/templates.js
@@ -86,7 +86,7 @@ describe('template_api', function() {
         },
         function postTemplate(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 403);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('errors'), res.body);
@@ -100,7 +100,7 @@ describe('template_api', function() {
         },
         function rePostTemplate(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsedBody = JSON.parse(res.body);
           var expectedBody = { template_id: expected_tpl_id };
@@ -111,7 +111,7 @@ describe('template_api', function() {
         },
         function checkFailure(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 400, res.body);
           var parsedBody = JSON.parse(res.body);
           assert.ok(parsedBody.hasOwnProperty('errors'), res.body);
@@ -120,26 +120,35 @@ describe('template_api', function() {
           return null;
         },
         function finish(err) {
-          if ( err ) errors.push(err);
+          if ( err ) {
+              errors.push(err);
+          }
           redis_client.keys("map_*|localhost", function(err, keys) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               var todrop = _.map(keys, function(m) {
-                if ( m.match(/^map_(tpl|crt)|/) )
-                  return m;
+                if ( m.match(/^map_(tpl|crt)|/) ) {
+                    return m;
+                }
               });
               if ( todrop.length !== 1 ) {
                 errors.push(new Error("Unexpected keys in redis: " + todrop));
               } else {
-                if ( todrop.indexOf('map_tpl|localhost') == -1 ) {
+                if ( todrop.indexOf('map_tpl|localhost') === -1 ) {
                   errors.push(new Error("Missing 'map_tpl|localhost' key in redis"));
                 }
               }
               redis_client.del(todrop, function(err) {
-                if ( err ) errors.push(err.message);
+                if ( err ) {
+                    errors.push(err.message);
+                }
                 if ( errors.length ) {
                   done(new Error(errors));
                 }
-                else done(null);
+                else {
+                    done(null);
+                }
               });
           });
         }
@@ -170,7 +179,7 @@ describe('template_api', function() {
         },
         function checkFailure1(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 400, res.body);
           var parsedBody = JSON.parse(res.body);
           assert.ok(parsedBody.hasOwnProperty('errors'), res.body);
@@ -181,7 +190,7 @@ describe('template_api', function() {
         },
         function postTemplate2(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           // clone the valid one and rename it
           var broken_template = JSON.parse(JSON.stringify(template_acceptance1));
           broken_template.name = 'broken1';
@@ -200,7 +209,7 @@ describe('template_api', function() {
         },
         function checkFailure2(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 400, res.body);
           var parsedBody = JSON.parse(res.body);
           assert.ok(parsedBody.hasOwnProperty('errors'), res.body);
@@ -211,7 +220,7 @@ describe('template_api', function() {
         },
         function postTemplateValid(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           // clone the valid one and rename it
           var broken_template = JSON.parse(JSON.stringify(template_acceptance1));
           broken_template.name = 'broken1';
@@ -227,7 +236,7 @@ describe('template_api', function() {
         },
         function putTemplateInvalid(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template_id'),
@@ -251,7 +260,7 @@ describe('template_api', function() {
         },
         function deleteTemplate(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 400, res.statusCode + ": " + res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('errors'),
@@ -270,24 +279,34 @@ describe('template_api', function() {
             function(res, err) { next(err, res); });
         },
         function checkDelete(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 204, res.statusCode + ': ' + res.body);
           assert.ok(!res.body, 'Unexpected body in DELETE /template response');
           return null;
         },
         function finish(err) {
           var errors = [];
-          if ( err ) errors.push(err);
+          if ( err ) {
+              errors.push(err);
+          }
           redis_client.keys("map_*|localhost", function(err, keys) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               var todrop = _.map(keys, function(m) {
-                if ( m.match(/^map_(tpl|crt)|/) )
-                  return m;
+                if ( m.match(/^map_(tpl|crt)|/) ) {
+                    return m;
+                }
               });
-              if ( todrop.length )
-                errors.push(new Error("Unexpected keys in redis: " + todrop));
-              if ( errors.length ) done(new Error(errors.join(',')));
-              else done();
+              if ( todrop.length ) {
+                  errors.push(new Error("Unexpected keys in redis: " + todrop));
+              }
+              if ( errors.length ) {
+                  done(new Error(errors.join(',')));
+              }
+              else {
+                  done();
+              }
           });
         }
       );
@@ -350,7 +369,7 @@ describe('template_api', function() {
           });
         },
         function deleteTemplate(err) {
-          if ( err ) throw err;
+            assert.ifError(err);
           var del_request = {
               url: '/api/v1/map/named/' + tmpl.name + '?api_key=1234',
               method: 'DELETE',
@@ -384,7 +403,7 @@ describe('template_api', function() {
         },
         function postTemplate2(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template_id'),
@@ -406,7 +425,7 @@ describe('template_api', function() {
         },
         function litsTemplatesUnauthenticated(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template_id'),
@@ -423,7 +442,7 @@ describe('template_api', function() {
         },
         function litsTemplates(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 403, res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('errors'),
@@ -441,40 +460,50 @@ describe('template_api', function() {
         },
         function checkList(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template_ids'),
             "Missing 'template_ids' from response body: " + res.body);
           var ids = parsed.template_ids;
           assert.equal(ids.length, 2);
-          assert.ok(ids.indexOf(tplid1) != -1,
+          assert.ok(ids.indexOf(tplid1) !== -1,
             'Missing "' + tplid1 + "' from list response: " + ids.join(','));
-          assert.ok(ids.indexOf(tplid2) != -1,
+          assert.ok(ids.indexOf(tplid2) !== -1,
             'Missing "' + tplid2 + "' from list response: " + ids.join(','));
           return null;
         },
         function finish(err) {
-          if ( err ) errors.push(err);
+          if ( err ) {
+              errors.push(err);
+          }
           redis_client.keys("map_*|localhost", function(err, keys) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               var todrop = _.map(keys, function(m) {
                 if ( m.match(/^map_(tpl|crt)|/) )
-                  return m;
+                {
+                    return m;
+                }
               });
               if ( todrop.length !== 1 ) {
                 errors.push(new Error("Unexpected keys in redis: " + todrop));
               } else {
-                if ( todrop.indexOf('map_tpl|localhost') == -1 ) {
+                if ( todrop.indexOf('map_tpl|localhost') === -1 ) {
                   errors.push(new Error("Missing 'map_tpl|localhost' key in redis"));
                 }
               }
               redis_client.del(todrop, function(err) {
-                if ( err ) errors.push(err.message);
+                if ( err ) {
+                    errors.push(err.message);
+                }
                 if ( errors.length ) {
                   done(new Error(errors));
                 }
-                else done(null);
+                else {
+                    done(null);
+                }
               });
           });
         }
@@ -500,7 +529,7 @@ describe('template_api', function() {
         },
         function putMisnamedTemplate(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template_id'),
@@ -521,7 +550,7 @@ describe('template_api', function() {
         },
         function putUnexistentTemplate(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 400, res.statusCode + ": " + res.body);
           var parsedBody = JSON.parse(res.body);
           assert.ok(parsedBody.hasOwnProperty('errors'), res.body);
@@ -539,7 +568,7 @@ describe('template_api', function() {
         },
         function putValidTemplate(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 400, res.statusCode + ": " + res.body);
           var parsedBody = JSON.parse(res.body);
           assert.ok(parsedBody.hasOwnProperty('errors'), res.body);
@@ -557,7 +586,7 @@ describe('template_api', function() {
         },
         function checkValidUpate(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.statusCode + ": " + res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template_id'),
@@ -566,26 +595,35 @@ describe('template_api', function() {
           return null;
         },
         function finish(err) {
-          if ( err ) errors.push(err);
+          if ( err ) {
+              errors.push(err);
+          }
           redis_client.keys("map_*|localhost", function(err, keys) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               var todrop = _.map(keys, function(m) {
-                if ( m.match(/^map_(tpl|crt)|/) )
-                  return m;
+                if ( m.match(/^map_(tpl|crt)|/) ) {
+                    return m;
+                }
               });
               if ( todrop.length !== 1 ) {
                 errors.push(new Error("Unexpected keys in redis: " + todrop));
               } else {
-                if ( todrop.indexOf('map_tpl|localhost') == -1 ) {
+                if ( todrop.indexOf('map_tpl|localhost') === -1 ) {
                   errors.push(new Error("Missing 'map_tpl|localhost' key in redis"));
                 }
               }
               redis_client.del(todrop, function(err) {
-                if ( err ) errors.push(err.message);
+                if ( err ) {
+                    errors.push(err.message);
+                }
                 if ( errors.length ) {
                   done(new Error(errors));
                 }
-                else done(null);
+                else {
+                    done(null);
+                }
               });
           });
         }
@@ -611,7 +649,7 @@ describe('template_api', function() {
         },
         function getTemplateUnauthorized(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template_id'),
@@ -628,7 +666,7 @@ describe('template_api', function() {
         },
         function getTemplate(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 403, res.statusCode + ": " + res.body);
           var parsedBody = JSON.parse(res.body);
           assert.ok(parsedBody.hasOwnProperty('errors'), res.body);
@@ -645,7 +683,7 @@ describe('template_api', function() {
         },
         function checkReturnTemplate(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.statusCode + ": " + res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template'),
@@ -654,26 +692,35 @@ describe('template_api', function() {
           return null;
         },
         function finish(err) {
-          if ( err ) errors.push(err);
+          if ( err ) {
+              errors.push(err);
+          }
           redis_client.keys("map_*|localhost", function(err, keys) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               var todrop = _.map(keys, function(m) {
-                if ( m.match(/^map_(tpl|crt)|/) )
-                  return m;
+                if ( m.match(/^map_(tpl|crt)|/) ) {
+                    return m;
+                }
               });
               if ( todrop.length !== 1 ) {
                 errors.push(new Error("Unexpected keys in redis: " + todrop));
               } else {
-                if ( todrop.indexOf('map_tpl|localhost') == -1 ) {
+                if ( todrop.indexOf('map_tpl|localhost') === -1 ) {
                   errors.push(new Error("Missing 'map_tpl|localhost' key in redis"));
                 }
               }
               redis_client.del(todrop, function(err) {
-                if ( err ) errors.push(err.message);
+                if ( err ) {
+                    errors.push(err.message);
+                }
                 if ( errors.length ) {
                   done(new Error(errors));
                 }
-                else done(null);
+                else {
+                    done(null);
+                }
               });
           });
         }
@@ -699,7 +746,7 @@ describe('template_api', function() {
         },
         function getTemplate(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template_id'),
@@ -716,7 +763,7 @@ describe('template_api', function() {
         },
         function deleteTemplateUnauthorized(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.statusCode + ": " + res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template'),
@@ -733,7 +780,7 @@ describe('template_api', function() {
         },
         function deleteTemplate(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 403, res.statusCode + ": " + res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('errors'),
@@ -751,7 +798,7 @@ describe('template_api', function() {
         },
         function getMissingTemplate(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 204, res.statusCode + ': ' + res.body);
           assert.ok(!res.body, 'Unexpected body in DELETE /template response');
           var get_request = {
@@ -765,7 +812,7 @@ describe('template_api', function() {
         },
         function checkGetFailure(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 404, res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('errors'),
@@ -775,27 +822,38 @@ describe('template_api', function() {
           return null;
         },
         function finish(err) {
-          if ( err ) errors.push(err);
+          if ( err ) {
+              errors.push(err);
+          }
           redis_client.keys("map_*|localhost", function(err, keys) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               var todrop = _.map(keys, function(m) {
-                if ( m.match(/^map_(tpl|crt)|/) )
-                  return m;
+                if ( m.match(/^map_(tpl|crt)|/) ) {
+                    return m;
+                }
               });
               if ( todrop.length ) {
                 errors.push(new Error("Unexpected keys in redis: " + todrop));
                 redis_client.del(todrop, function(err) {
-                  if ( err ) errors.push(err.message);
+                  if ( err ) {
+                      errors.push(err.message);
+                  }
                   if ( errors.length ) {
                     done(new Error(errors));
                   }
-                  else done(null);
+                  else {
+                      done(null);
+                  }
                 });
               } else {
                   if ( errors.length ) {
                     done(new Error(errors));
                   }
-                  else done(null);
+                  else {
+                      done(null);
+                  }
               }
           });
         }
@@ -842,7 +900,7 @@ describe('template_api', function() {
         },
         function instanciateNoAuth(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template_id'),
@@ -860,7 +918,7 @@ describe('template_api', function() {
         },
         // See https://github.com/CartoDB/Windshaft-cartodb/issues/173
         function instanciateForeignDB(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 403,
             'Unexpected success instanciating template with no auth: ' + res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
@@ -880,7 +938,7 @@ describe('template_api', function() {
         },
         function instanciateAuth(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 404, res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('errors'), "Missing 'errors' from response body: " + res.body);
@@ -896,7 +954,7 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function fetchTileNoAuth(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200,
             'Instantiating template: ' + res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
@@ -919,7 +977,7 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function fetchTileAuth(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 403,
             'Fetching tile with no auth: ' + res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
@@ -938,7 +996,7 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function checkTile(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, 
             'Unexpected error for authorized instance: ' + res.statusCode + ' -- ' + res.body);
           assert.equal(res.headers['content-type'], "image/png");
@@ -946,7 +1004,7 @@ describe('template_api', function() {
         },
         // See https://github.com/CartoDB/Windshaft-cartodb/issues/172
         function fetchTileForeignSignature(err) {
-          if ( err ) throw err;
+            assert.ifError(err);
           var foreignsigned = layergroupid.replace(/[^@]*@/, 'foreign@');
           var get_request = {
               url: '/api/v1/map/' + foreignsigned + '/0/0/0.png?auth_token=valid1',
@@ -959,7 +1017,7 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function checkForeignSignerError(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 403, 
             'Unexpected error for authorized instance: ' + res.statusCode + ' -- ' + res.body);
           var parsed = JSON.parse(res.body);
@@ -971,7 +1029,7 @@ describe('template_api', function() {
         },
         function deleteTemplate(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var del_request = {
               url: '/api/v1/map/named/' + tpl_id + '?api_key=1234',
               method: 'DELETE',
@@ -982,7 +1040,7 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function fetchTileDeleted(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 204,
             'Deleting template: ' + res.statusCode + ':' + res.body);
           var get_request = {
@@ -996,33 +1054,45 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function checkTileAvailable(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, 'Tile should be accessible');
           assert.equal(res.headers['content-type'], "image/png");
           return null;
         },
         function finish(err) {
-          if ( err ) errors.push(err);
+          if ( err ) {
+              errors.push(err);
+          }
           redis_client.keys("map_*|localhost", function(err, keys) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               var todrop = _.map(keys, function(m) {
                 if ( m.match(/^map_(tpl|crt)|/) )
-                  return m;
+                {
+                    return m;
+                }
               });
               if ( todrop.length ) {
                 errors.push(new Error("Unexpected keys in redis: " + todrop));
                 redis_client.del(todrop, function(err) {
-                  if ( err ) errors.push(err.message);
+                  if ( err ) {
+                      errors.push(err.message);
+                  }
                   if ( errors.length ) {
                     done(new Error(errors));
                   }
-                  else done(null);
+                  else {
+                      done(null);
+                  }
                 });
               } else {
                   if ( errors.length ) {
                     done(new Error(errors));
                   }
-                  else done(null);
+                  else {
+                      done(null);
+                  }
               }
           });
         }
@@ -1068,7 +1138,7 @@ describe('template_api', function() {
         },
         function instanciateNoAuth(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template_id'),
@@ -1086,7 +1156,7 @@ describe('template_api', function() {
         },
         function instanciateAuth(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 403,
             'Unexpected success instanciating template with no auth: ' + res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
@@ -1105,7 +1175,7 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function fetchTileNoAuth(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200,
             'Instantiating template: ' + res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
@@ -1128,7 +1198,7 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function fetchTileAuth(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 403,
             'Fetching tile with no auth: ' + res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
@@ -1147,7 +1217,7 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function checkTile_fetchOnRestart(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, 
             'Unexpected error for authorized instance: ' + res.statusCode + ' -- ' + res.body);
           assert.equal(res.headers['content-type'], "application/json; charset=utf-8");
@@ -1167,7 +1237,7 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function checkCacheChannel(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, 
             'Unexpected error for authorized instance: ' + res.statusCode + ' -- ' + res.body);
           assert.equal(res.headers['content-type'], "application/json; charset=utf-8");
@@ -1178,7 +1248,7 @@ describe('template_api', function() {
         },
         function deleteTemplate(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var del_request = {
               url: '/api/v1/map/named/' + tpl_id + '?api_key=1234',
               method: 'DELETE',
@@ -1189,7 +1259,7 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function fetchTileDeleted(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 204,
             'Deleting template: ' + res.statusCode + ':' + res.body);
           var get_request = {
@@ -1203,33 +1273,45 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function checkTorqueTileAvailable(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, 'Torque tile should be accessible');
           assert.equal(res.headers['content-type'], "application/json; charset=utf-8");
           return null;
         },
         function finish(err) {
-          if ( err ) errors.push(err);
+          if ( err ) {
+              errors.push(err);
+          }
           redis_client.keys("map_*|localhost", function(err, keys) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               var todrop = _.map(keys, function(m) {
                 if ( m.match(/^map_(tpl|crt)|/) )
-                  return m;
+                {
+                    return m;
+                }
               });
               if ( todrop.length ) {
                 errors.push(new Error("Unexpected keys in redis: " + todrop));
                 redis_client.del(todrop, function(err) {
-                  if ( err ) errors.push(err.message);
+                  if ( err ) {
+                      errors.push(err.message);
+                  }
                   if ( errors.length ) {
                     done(new Error(errors));
                   }
-                  else done(null);
+                  else {
+                      done(null);
+                  }
                 });
               } else {
                   if ( errors.length ) {
                     done(new Error(errors));
                   }
-                  else done(null);
+                  else {
+                      done(null);
+                  }
               }
           });
         }
@@ -1276,7 +1358,7 @@ describe('template_api', function() {
         },
         function instanciateNoAuth(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template_id'),
@@ -1294,7 +1376,7 @@ describe('template_api', function() {
         },
         function instanciateAuth(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 403,
             'Unexpected success instanciating template with no auth: ' + res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
@@ -1313,7 +1395,7 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function fetchAttributeNoAuth(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200,
             'Instantiating template: ' + res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
@@ -1337,7 +1419,7 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function fetchAttributeAuth(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 403,
             'Fetching tile with no auth: ' + res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
@@ -1356,7 +1438,7 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function checkAttribute(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, 
             'Unexpected error for authorized getAttributes: ' + res.statusCode + ' -- ' + res.body);
           assert.equal(res.headers['content-type'], "application/json; charset=utf-8");
@@ -1364,7 +1446,7 @@ describe('template_api', function() {
         },
         function deleteTemplate(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var del_request = {
               url: '/api/v1/map/named/' + tpl_id + '?api_key=1234',
               method: 'DELETE',
@@ -1375,7 +1457,7 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function fetchAttrDeleted(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 204,
             'Deleting template: ' + res.statusCode + ':' + res.body);
           var get_request = {
@@ -1389,33 +1471,45 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function checkLayerAttributesAvailable(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, 'Layer attributes should be accessible');
           assert.equal(res.headers['content-type'], "application/json; charset=utf-8");
           return null;
         },
         function finish(err) {
-          if ( err ) errors.push(err);
+          if ( err ) {
+              errors.push(err);
+          }
           redis_client.keys("map_*|localhost", function(err, keys) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               var todrop = _.map(keys, function(m) {
                 if ( m.match(/^map_(tpl|crt)|/) )
-                  return m;
+                {
+                    return m;
+                }
               });
               if ( todrop.length ) {
                 errors.push(new Error("Unexpected keys in redis: " + todrop));
                 redis_client.del(todrop, function(err) {
-                  if ( err ) errors.push(err.message);
+                  if ( err ) {
+                      errors.push(err.message);
+                  }
                   if ( errors.length ) {
                     done(new Error(errors));
                   }
-                  else done(null);
+                  else {
+                      done(null);
+                  }
                 });
               } else {
                   if ( errors.length ) {
                     done(new Error(errors));
                   }
-                  else done(null);
+                  else {
+                      done(null);
+                  }
               }
           });
         }
@@ -1460,7 +1554,7 @@ describe('template_api', function() {
         },
         function instanciateNoAuth(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template_id'),
@@ -1479,7 +1573,7 @@ describe('template_api', function() {
         },
         function instanciateAuth(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200,
             'Unexpected success instanciating template with no auth: ' + res.statusCode + ': ' + res.body);
           done();
@@ -1523,7 +1617,7 @@ describe('template_api', function() {
         },
         function instanciateNoAuth(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template_id'),
@@ -1540,7 +1634,7 @@ describe('template_api', function() {
         },
         function checkInstanciation(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.statusCode + ': ' + res.body);
           // See https://github.com/CartoDB/Windshaft-cartodb/issues/176
           helper.checkCache(res);
@@ -1596,7 +1690,7 @@ describe('template_api', function() {
         },
         function instanciateNoAuth(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template_id'),
@@ -1613,7 +1707,7 @@ describe('template_api', function() {
         },
         function checkInstanciation(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.statusCode + ': ' + res.body);
           // See https://github.com/CartoDB/Windshaft-cartodb/issues/176
           helper.checkCache(res);
@@ -1659,13 +1753,17 @@ describe('template_api', function() {
         {
           var next = this;
           redis_stats_client.select(redis_stats_db, function(err) {
-            if ( err ) next(err);
-            else redis_stats_client.del(statskey+':global', next);
+            if ( err ) {
+                next(err);
+            }
+            else {
+                redis_stats_client.del(statskey+':global', next);
+            }
           });
         },
         function do_post_tempate(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var post_request = {
               url: '/api/v1/map/named?api_key=1234',
               method: 'POST',
@@ -1677,7 +1775,7 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function instantiateTemplate(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           template_id = JSON.parse(res.body).template_id;
           var post_request = {
@@ -1691,7 +1789,7 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function check_global_stats(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200,
             'Instantiating template: ' + res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
@@ -1700,19 +1798,19 @@ describe('template_api', function() {
           redis_stats_client.ZSCORE(statskey + ":global", now, this);
         },
         function check_tag_stats(err, val) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(val, 1, "Expected score of " + now + " in " +  statskey + ":global to be 1, got " + val);
           redis_stats_client.ZSCORE(statskey+':stat_tag:random_tag', now, this);
         },
         function check_tag_stats_value(err, val) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(val, 1, "Expected score of " + now + " in " +  statskey + ":stat_tag:" + layergroup.stat_tag +
               " to be 1, got " + val);
           return null;
         },
         function deleteTemplate(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           var del_request = {
               url: '/api/v1/map/named/' + template_id + '?api_key=1234',
               method: 'DELETE',
@@ -1723,15 +1821,23 @@ describe('template_api', function() {
             function(res) { next(null, res); });
         },
         function cleanup_stats(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 204, res.statusCode + ': ' + res.body);
-          if ( err ) errors.push('' + err);
+          if ( err ) {
+              errors.push('' + err);
+          }
           redis_client.del([statskey+':global', statskey+':stat_tag:'+layergroup.stat_tag], this);
         },
         function finish(err) {
-          if ( err ) errors.push('' + err);
-          if ( errors.length ) done(new Error(errors.join(',')));
-          else done(null);
+          if ( err ) {
+              errors.push('' + err);
+          }
+          if ( errors.length ) {
+              done(new Error(errors.join(',')));
+          }
+          else {
+              done(null);
+          }
         }
       );
     });
@@ -1776,7 +1882,7 @@ describe('template_api', function() {
         },
         function instance1(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template_id'),
@@ -1793,7 +1899,7 @@ describe('template_api', function() {
             function(res, err) { next(err, res); });
         },
         function checkInstance1(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200,
             'Instantiating template: ' + res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
@@ -1805,7 +1911,7 @@ describe('template_api', function() {
         },
         function updateTemplate(err)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           // clone the valid one and rename it
           var changedTemplate = JSON.parse(JSON.stringify(template_acceptance2));
           changedTemplate.auth.method = 'open';
@@ -1821,7 +1927,7 @@ describe('template_api', function() {
         },
         function instance2(err, res)
         {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200, res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('template_id'),
@@ -1838,37 +1944,47 @@ describe('template_api', function() {
             function(res, err) { next(err, res); });
         },
         function checkInstance2(err, res) {
-          if ( err ) throw err;
+            assert.ifError(err);
           assert.equal(res.statusCode, 200,
             'Instantiating template: ' + res.statusCode + ': ' + res.body);
           var parsed = JSON.parse(res.body);
           assert.ok(parsed.hasOwnProperty('layergroupid'),
             "Missing 'layergroupid' from response body: " + res.body);
-          assert.ok(layergroupid != parsed.layergroupid);
+          assert.ok(layergroupid !== parsed.layergroupid);
           helper.checkSurrogateKey(res, new NamedMapsCacheEntry('localhost', template_acceptance2.name).key());
           return null;
         },
         function finish(err) {
-          if ( err ) errors.push(err);
+          if ( err ) {
+              errors.push(err);
+          }
           redis_client.keys("map_*|localhost", function(err, keys) {
-              if ( err ) errors.push(err.message);
+              if ( err ) {
+                  errors.push(err.message);
+              }
               var todrop = _.map(keys, function(m) {
                 if ( m.match(/^map_(tpl|crt)|/) )
-                  return m;
+                {
+                    return m;
+                }
               });
               if ( todrop.length !== 1 ) {
                 errors.push(new Error("Unexpected keys in redis: " + todrop));
               } else {
-                if ( todrop.indexOf('map_tpl|localhost') == -1 ) {
+                if ( todrop.indexOf('map_tpl|localhost') === -1 ) {
                   errors.push(new Error("Missing 'map_tpl|localhost' key in redis"));
                 }
               }
               redis_client.del(todrop, function(err) {
-                if ( err ) errors.push(err.message);
+                if ( err ) {
+                    errors.push(err.message);
+                }
                 if ( errors.length ) {
                   done(new Error(errors));
                 }
-                else done(null);
+                else {
+                    done(null);
+                }
               });
           });
         }
@@ -2027,25 +2143,35 @@ describe('template_api', function() {
                     errors.push(err);
                 }
                 redis_client.keys("map_*|localhost", function(err, keys) {
-                    if ( err ) errors.push(err.message);
+                    if ( err ) {
+                        errors.push(err.message);
+                    }
                     var todrop = _.map(keys, function(m) {
                         if ( m.match(/^map_(tpl|crt)|/) )
+                        {
                             return m;
+                        }
                     });
                     if ( todrop.length ) {
                         errors.push(new Error("Unexpected keys in redis: " + todrop));
                         redis_client.del(todrop, function(err) {
-                            if ( err ) errors.push(err.message);
+                            if ( err ) {
+                                errors.push(err.message);
+                            }
                             if ( errors.length ) {
                                 done(new Error(errors));
                             }
-                            else done(null);
+                            else {
+                                done(null);
+                            }
                         });
                     } else {
                         if ( errors.length ) {
                             done(new Error(errors));
                         }
-                        else done(null);
+                        else {
+                            done(null);
+                        }
                     }
                 });
             }
@@ -2120,7 +2246,9 @@ describe('template_api', function() {
         // 'map_style|null|publicuser|my_table',
         redis_client.keys("map_*", function(err, keys) {
             var todrop = _.map(keys, function(m) {
-              if ( m.match(/^map_(tpl|crt|sig)|/) ) return m;
+              if ( m.match(/^map_(tpl|crt|sig)|/) ) {
+                  return m;
+              }
             });
             redis_client.del(todrop, function() {
               redis_client.select(5, function() {
diff --git a/test/unit/cartodb/template_maps.test.js b/test/unit/cartodb/template_maps.test.js
index f2203715..1f9792d1 100644
--- a/test/unit/cartodb/template_maps.test.js
+++ b/test/unit/cartodb/template_maps.test.js
@@ -202,7 +202,7 @@ describe('template_maps', function() {
         tmap.addTemplate('me', tpl, this);
       },
       function addOmonimousTemplate(err, id) {
-        if ( err ) throw err;
+        assert.ifError(err);
         tpl_id = id;
         assert.equal(tpl_id, 'first');
         expected_failure = true;
@@ -210,13 +210,15 @@ describe('template_maps', function() {
         tmap.addTemplate('me', tpl, this);
       },
       function getTemplate(err) {
-        if ( ! expected_failure && err ) throw err;
+        if ( ! expected_failure && err ) {
+            throw err;
+        }
         assert.ok(err);
         assert.ok(err.message.match(/already exists/i), err);
         tmap.getTemplate('me', tpl_id, this);
       },
       function delTemplate(err, got_tpl) {
-        if ( err ) throw err;
+        assert.ifError(err);
         assert.deepEqual(got_tpl, _.extend({}, tpl, {auth: {method: 'open'}, placeholders: {}}));
         tmap.delTemplate('me', tpl_id, this);
       },
@@ -238,31 +240,35 @@ describe('template_maps', function() {
         tmap.addTemplate('me', tpl1, this);
       },
       function addTemplate2(err, id) {
-        if ( err ) throw err;
+        assert.ifError(err);
         tpl1_id = id;
         tmap.addTemplate('me', tpl2, this);
       },
       function listTemplates(err, id) {
-        if ( err ) throw err;
+        assert.ifError(err);
         tpl2_id = id;
         tmap.listTemplates('me', this);
       },
       function checkTemplates(err, ids) {
-        if ( err ) throw err;
+        assert.ifError(err);
         assert.equal(ids.length, 2);
-        assert.ok(ids.indexOf(tpl1_id) != -1, ids.join(','));
-        assert.ok(ids.indexOf(tpl2_id) != -1, ids.join(','));
+        assert.ok(ids.indexOf(tpl1_id) !== -1, ids.join(','));
+        assert.ok(ids.indexOf(tpl2_id) !== -1, ids.join(','));
         return null;
       },
       function delTemplate1(err) {
         if ( tpl1_id ) {
           var next = this;
           tmap.delTemplate('me', tpl1_id, function(e) {
-            if ( err || e ) next(new Error(err + '; ' + e));
-            else next();
+            if ( err || e ) {
+                next(new Error(err + '; ' + e));
+            }
+            else {
+                next();
+            }
           });
         } else {
-          if ( err ) throw err;
+          assert.ifError(err);
           return null;
         }
       },
@@ -270,11 +276,15 @@ describe('template_maps', function() {
         if ( tpl2_id ) {
           var next = this;
           tmap.delTemplate('me', tpl2_id, function(e) {
-            if ( err || e ) next(new Error(err + '; ' + e));
-            else next();
+            if ( err || e ) {
+                next(new Error(err + '; ' + e));
+            }
+            else {
+                next();
+            }
           });
         } else {
-          if ( err ) throw err;
+          assert.ifError(err);
           return null;
         }
       },
@@ -301,14 +311,16 @@ describe('template_maps', function() {
       },
       // Updating template name should fail
       function updateTemplateName(err, id) {
-        if ( err ) throw err;
+        assert.ifError(err);
         tpl_id = id;
         expected_failure = true;
         tpl.name = 'second';
         tmap.updTemplate(owner, tpl_id, tpl, this);
       },
       function updateTemplateAuth(err) {
-        if ( err && ! expected_failure) throw err;
+        if ( err && ! expected_failure) {
+            throw err;
+        }
         expected_failure = false;
         assert.ok(err);
         tpl.name = 'first';
@@ -317,13 +329,15 @@ describe('template_maps', function() {
         tmap.updTemplate(owner, tpl_id, tpl, this);
       },
       function updateTemplateWithInvalid(err) {
-        if ( err ) throw err;
+        assert.ifError(err);
         tpl.version = '999.999.999';
         expected_failure = true;
         tmap.updTemplate(owner, tpl_id, tpl, this);
       },
       function updateUnexistentTemplate(err) {
-        if ( err && ! expected_failure) throw err;
+        if ( err && ! expected_failure) {
+            throw err;
+        }
         assert.ok(err);
         assert.ok(err.message.match(/unsupported.*version/i), err);
         tpl.version = '0.0.1';
@@ -331,7 +345,9 @@ describe('template_maps', function() {
         tmap.updTemplate(owner, 'unexistent', tpl, this);
       },
       function delTemplate(err) {
-        if ( err && ! expected_failure) throw err;
+        if ( err && ! expected_failure) {
+            throw err;
+        }
         expected_failure = false;
         assert.ok(err);
         assert.ok(err.message.match(/cannot update name/i), err);
@@ -456,14 +472,14 @@ describe('template_maps', function() {
         tmap.addTemplate('me', tpl, this);
       },
       function twoForMe(err, id) {
-        if ( err ) throw err;
+        assert.ifError(err);
         assert.ok(id);
         idMe.push(id);
         tpl.name = 'twoForMe';
         tmap.addTemplate('me', tpl, this);
       },
       function threeForMe(err, id) {
-        if ( err ) throw err;
+        assert.ifError(err);
         assert.ok(id);
         idMe.push(id);
         tpl.name = 'threeForMe';
@@ -471,37 +487,39 @@ describe('template_maps', function() {
         tmap.addTemplate('me', tpl, this);
       },
       function errForMe(err/*, id*/) {
-        if ( err && ! expectErr ) throw err;
+        if ( err && ! expectErr ) {
+            throw err;
+        }
         expectErr = false;
         assert.ok(err);
         assert.ok(err.message.match(/limit.*template/), err);
         return null;
       },
       function delOneMe(err) {
-        if ( err ) throw err;
+        assert.ifError(err);
         tmap.delTemplate('me', idMe.shift(), this);
       },
       function threeForMeRetry(err) {
-        if ( err ) throw err;
+        assert.ifError(err);
         tpl.name = 'threeForMe';
         tmap.addTemplate('me', tpl, this);
       },
       function oneForYou(err, id) {
-        if ( err ) throw err;
+        assert.ifError(err);
         assert.ok(id);
         idMe.push(id);
         tpl.name = 'oneForYou';
         tmap.addTemplate('you', tpl, this);
       },
       function twoForYou(err, id) {
-        if ( err ) throw err;
+        assert.ifError(err);
         assert.ok(id);
         idYou.push(id);
         tpl.name = 'twoForYou';
         tmap.addTemplate('you', tpl, this);
       },
       function threeForYou(err, id) {
-        if ( err ) throw err;
+        assert.ifError(err);
         assert.ok(id);
         idYou.push(id);
         tpl.name = 'threeForYou';
@@ -509,7 +527,9 @@ describe('template_maps', function() {
         tmap.addTemplate('you', tpl, this);
       },
       function errForYou(err/*, id*/) {
-        if ( err && ! expectErr ) throw err;
+        if ( err && ! expectErr ) {
+            throw err;
+        }
         expectErr = false;
         assert.ok(err);
         assert.ok(err.message.match(/limit.*template/), err);