From 4600005a867b1efcae0cde3fa49576b2afaf536a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Tue, 26 Sep 2017 17:31:57 +0200
Subject: [PATCH] Bring ported test back

---
 Makefile              | 4 ++--
 lib/cartodb/server.js | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 474d98a7..b9da32ce 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,8 @@ config.status--test:
 config/environments/test.js: config.status--test
 	./config.status--test
 
-# FIXME: remove -not -path filer
-TEST_SUITE := $(shell find test/{acceptance,integration,unit} -name "*.js" -not -path "*ported*" -not -path "*overviews_queries*")
+# FIXME: remove -not -path filer  -not -path "*ported*" -not -path "*overviews_queries*"
+TEST_SUITE := $(shell find test/{acceptance,integration,unit} -name "*.js")
 TEST_SUITE_UNIT := $(shell find test/unit -name "*.js")
 TEST_SUITE_INTEGRATION := $(shell find test/integration -name "*.js")
 TEST_SUITE_ACCEPTANCE := $(shell find test/acceptance -name "*.js")
diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js
index 16a01414..51841dca 100644
--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -211,7 +211,9 @@ module.exports = function(serverOptions) {
 
     var versions = getAndValidateVersions(serverOptions);
 
-    const prepareContext = prepareContextMiddleware(authApi, pgConnection);
+    const prepareContext = typeof serverOptions.req2params === 'function' ?
+        serverOptions.req2params :
+        prepareContextMiddleware(authApi, pgConnection);
 
     /*******************************************************************************************************************
      * Routing