cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updating tests to use cartodb-redis

Browse Source
This commit is contained in:
Simon Martín
2018-03-03 14:46:58 +01:00
parent 9bc9fc46ff
commit 31a554d94f
2 changed files with 2 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/acceptance/rate-limit.test.js
+2 -3
View File
@@ -8,7 +8,6 @@ const TestClient = require('../support/test-client');
const UserLimitsApi = require('../../lib/cartodb/api/user_limits_api');
const rateLimitMiddleware = require('../../lib/cartodb/middleware/rate-limit');
const { RATE_LIMIT_ENDPOINTS_GROUPS } = rateLimitMiddleware;
const { getStoreKey } = require('../../lib/cartodb/api/user_limits_api');
let userLimitsApi;
let rateLimit;
@@ -75,7 +74,7 @@ function setLimit(count, period, burst) {
return;
}
const key = getStoreKey(user, RATE_LIMIT_ENDPOINTS_GROUPS.ANONYMOUS);
const key = `limits:rate:store:${user}:maps:${RATE_LIMIT_ENDPOINTS_GROUPS.ANONYMOUS}`;
redisClient.rpush(key, burst);
redisClient.rpush(key, count);
redisClient.rpush(key, period);
@@ -109,7 +108,7 @@ function assertGetLayergroupRequest (status, limit, remaining, reset, retry, don
'X-Rate-Limit-Retry-After': retry
}
};
testClient.getLayergroup({ response }, err => {
assert.ifError(err);
if (done) {
test/unit/cartodb/rate-limit.test.js
-108
View File
@@ -1,108 +0,0 @@
require('../../support/test_helper');
const assert = require('assert');
const { getLowerRateLimit } = require('../../../lib/cartodb/api/user_limits_api');
describe('Lower rate limit', function () {
it("1 limit: not limited", function (done) {
const limits = [[0, 3, 1, -1, 1]];
const result = getLowerRateLimit(limits);
assert.deepEqual(limits[0], result);
done();
});
it("1 limit: limited", function (done) {
const limits = [[1, 3, 0, 0, 1]];
const result = getLowerRateLimit(limits);
assert.deepEqual(limits[0], result);
done();
});
it("empty or invalid", function (done) {
let limits = [];
let result = getLowerRateLimit(limits);
assert.deepEqual(null, result);
limits = undefined;
result = getLowerRateLimit(limits);
assert.deepEqual(null, result);
limits = null;
result = getLowerRateLimit(limits);
assert.deepEqual(null, result);
limits = [[]];
result = getLowerRateLimit(limits);
assert.deepEqual(null, result);
limits = [[], []];
result = getLowerRateLimit(limits);
assert.deepEqual(null, result);
limits = {};
result = getLowerRateLimit(limits);
assert.deepEqual(null, result);
limits = [{}];
result = getLowerRateLimit(limits);
assert.deepEqual(null, result);
limits = [[1, 2]];
result = getLowerRateLimit(limits);
assert.deepEqual(null, result);
done();
});
it("multiple limits: valid and invalid", function (done) {
const limit1 = [0, 3, 0];
const limit2 = [0, 3, 1, 0, 1];
let limits = [limit1, limit2];
let result = getLowerRateLimit(limits);
assert.deepEqual(limit2, result);
limits = [limit2, limit1];
result = getLowerRateLimit(limits);
assert.deepEqual(limit2, result);
done();
});
it("multiple limits: not limited", function (done) {
const limit1 = [0, 3, 2, 0, 1];
const limit2 = [0, 3, 3, 0, 1];
const limit3 = [0, 3, 1, 0, 1];
const limit4 = [0, 3, 4, 0, 1];
const limit5 = [0, 3, 5, 0, 1];
let limits = [limit1, limit2, limit3, limit4, limit5];
let result = getLowerRateLimit(limits);
assert.deepEqual(limit3, result);
limits = [limit1, limit2];
result = getLowerRateLimit(limits);
assert.deepEqual(limit1, result);
done();
});
it("multiple limits: limited", function (done) {
const limit1 = [0, 3, 2, 0, 1];
const limit2 = [0, 3, 3, 0, 1];
const limit3 = [0, 3, 1, 0, 1];
const limit4 = [0, 3, 4, 0, 1];
const limit5 = [1, 3, 5, 0, 1];
let limits = [limit1, limit2, limit3, limit4, limit5];
let result = getLowerRateLimit(limits);
assert.deepEqual(limit5, result);
limits = [limit1, limit2, limit5, limit3, limit4];
result = getLowerRateLimit(limits);
assert.deepEqual(limit5, result);
done();
});
});