From f26ddef24470188ea6a96be84948d0e2bf9ee699 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Wed, 17 Oct 2018 15:09:09 +0200 Subject: [PATCH] Make rate limit tests work in dual mode --- test/acceptance/rate-limit.test.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/test/acceptance/rate-limit.test.js b/test/acceptance/rate-limit.test.js index 412a232a..a6465d1d 100644 --- a/test/acceptance/rate-limit.test.js +++ b/test/acceptance/rate-limit.test.js @@ -7,6 +7,7 @@ const cartodbRedis = require('cartodb-redis'); const TestClient = require('../support/test-client'); const UserLimitsBackend = require('../../lib/cartodb/backends/user-limits'); const rateLimitMiddleware = require('../../lib/cartodb/api/middlewares/rate-limit'); +const serverOptions = require('../../lib/cartodb/server_options'); const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimitMiddleware; let userLimitsApi; @@ -273,7 +274,21 @@ describe('rate limit middleware', function () { }); }); -describe('rate limit and vector tiles', function () { +const describe_pg = process.env.POSTGIS_VERSION >= '20400' ? describe : describe.skip; +const originalUsePostGIS = serverOptions.renderer.mvt.usePostGIS; + +describe('rate limit and vector tiles (mapnik)', () => { rateLimitAndVectorTilesTest(false); }); +describe_pg('rate limit and vector tiles (postgis)', () => { rateLimitAndVectorTilesTest(true); }); + +function rateLimitAndVectorTilesTest(usePostGIS) { + + before(function() { + serverOptions.renderer.mvt.usePostGIS = usePostGIS; + }); + + after(function () { + serverOptions.renderer.mvt.usePostGIS = originalUsePostGIS; + }); before(function(done) { global.environment.enabledFeatures.rateLimitsEnabled = true; @@ -358,4 +373,4 @@ describe('rate limit and vector tiles', function () { }); }); -}); +}