Use env vars and fix tests

This commit is contained in:
Álvaro
2020-12-16 16:32:32 +01:00
committed by GitHub
parent 92be27e700
commit 5c491a25cf
23 changed files with 1434 additions and 337 deletions
+5 -1
View File
@@ -512,7 +512,11 @@ var QueryTables = require('cartodb-query-tables').queryTables;
]
};
var statskey = 'user:localhost:mapviews';
var redisStatsClient = redis.createClient(global.environment.redis.port);
var redisStatsClient = redis.createClient(
{
port: global.environment.redis.port,
host: global.environment.redis.host
});
var expectedToken; // will be set on first post and checked on second
var now = strftime('%Y%m%d', new Date());
step(
+15 -3
View File
@@ -164,7 +164,11 @@ describe('rate limit', function () {
global.environment.enabledFeatures.rateLimitsEnabled = true;
global.environment.enabledFeatures.rateLimitsByEndpoint.anonymous = true;
redisClient = redis.createClient(global.environment.redis.port);
redisClient = redis.createClient(
{
port: global.environment.redis.port,
host: global.environment.redis.host
});
testClient = new TestClient(createMapConfig(), 1234);
});
@@ -226,7 +230,11 @@ describe('rate limit middleware', function () {
});
rateLimit = rateLimitMiddleware(userLimitsApi, RATE_LIMIT_ENDPOINTS_GROUPS.ANONYMOUS);
redisClient = redis.createClient(global.environment.redis.port);
redisClient = redis.createClient(
{
port: global.environment.redis.port,
host: global.environment.redis.host
});
testClient = new TestClient(createMapConfig(), 1234);
const count = 1;
@@ -290,7 +298,11 @@ function rateLimitAndVectorTilesTest (usePostGIS) {
global.environment.enabledFeatures.rateLimitsEnabled = true;
global.environment.enabledFeatures.rateLimitsByEndpoint.tile = true;
redisClient = redis.createClient(global.environment.redis.port);
redisClient = redis.createClient(
{
port: global.environment.redis.port,
host: global.environment.redis.host
});
const count = 1;
const period = 1;
const burst = 0;
+5 -1
View File
@@ -1506,7 +1506,11 @@ describe('template_api', function () {
layergroup: layergroup
};
var statskey = 'user:localhost:mapviews';
var redisStatsClient = redis.createClient(global.environment.redis.port);
var redisStatsClient = redis.createClient(
{
port: global.environment.redis.port,
host: global.environment.redis.host
});
var templateId; // will be set on template post
var now = strftime('%Y%m%d', new Date());
var errors = [];