Merge branch 'master' into analysis-layers

Conflicts:
	npm-shrinkwrap.json
	test/support/test-client.js

test/support/prepare_db.sh

@@ -80,7 +80,7 @@ if test x"$PREPARE_PGSQL" = xyes; then
 
   cat sql/_CDB_QueryStatements.sql | psql -v ON_ERROR_STOP=1 ${TEST_DB} || exit 1
 
-  SQL_SCRIPTS='CDB_QueryTables CDB_CartodbfyTable CDB_TableMetadata CDB_ForeignTable CDB_UserTables CDB_ColumnNames CDB_ZoomFromScale CDB_Overviews'
+  SQL_SCRIPTS='CDB_QueryTables CDB_CartodbfyTable CDB_TableMetadata CDB_ForeignTable CDB_UserTables CDB_ColumnNames CDB_ZoomFromScale CDB_Overviews CDB_QuantileBins CDB_JenksBins CDB_HeadsTailsBins CDB_EqualIntervalBins'
   for i in ${SQL_SCRIPTS}
   do
     curl -L -s https://github.com/CartoDB/cartodb-postgresql/raw/master/scripts-available/$i.sql -o sql/$i.sql

test/support/test-client.js

@@ -168,7 +168,8 @@ TestClient.prototype.getTile = function(z, x, y, params, callback) {
             url = '/api/v1/map/' + layergroupId + '/';
 
             var layers = params.layers;
-            if (!!layers) {
+
+            if (layers !== undefined) {
                 layers = Array.isArray(layers) ? layers : [layers];
                 url += layers.join(',') + '/';
             }
@@ -190,7 +191,6 @@ TestClient.prototype.getTile = function(z, x, y, params, callback) {
                 }
             };
 
-
             var expectedResponse = {
                 status: 200,
                 headers: {
@@ -198,7 +198,7 @@ TestClient.prototype.getTile = function(z, x, y, params, callback) {
                 }
             };
 
-            var isPng = format === 'png';
+            var isPng = format === 'png' || format === 'torque.png';
 
             if (isPng) {
                 request.encoding = 'binary';