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

Make the cache headers tests idempotent

Browse Source
This commit is contained in:
Mario de Frutos
2017-04-07 16:17:04 +02:00
parent 1fc49b5ad5
commit fff2c33100
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/acceptance/cache/cache_headers.js
Vendored
+17 -5
View File
@@ -29,7 +29,10 @@ describe('get requests with cache headers', function() {
{
"description": "cache headers should be present",
"cache_headers": {
"x_cache_channel": "test_windshaft_cartodb_user_1_db:public.test_table",
"x_cache_channel": {
"db_name": "test_windshaft_cartodb_user_1_db",
"tables": ["public.test_table"]
},
"surrogate_keys": "t:77pJnX"
},
"data":
@@ -68,9 +71,11 @@ describe('get requests with cache headers', function() {
{
"description": "cache headers should be present and be composed with source table name",
"cache_headers": {
"x_cache_channel": "test_windshaft_cartodb_user_1_db:" +
"public.analysis_2f13a3dbd7_9eb239903a1afd8a69130d1ece0fc8b38de8592d" +
",public.test_table",
"x_cache_channel": {
"db_name": "test_windshaft_cartodb_user_1_db",
"tables": ["public.analysis_2f13a3dbd7_9eb239903a1afd8a69130d1ece0fc8b38de8592d",
"public.test_table"]
},
"surrogate_keys": "t:77pJnX t:iL4eth"
},
"data":
@@ -151,7 +156,7 @@ describe('get requests with cache headers', function() {
assert.ok(res.headers['x-cache-channel']);
assert.ok(res.headers['surrogate-key']);
if (expectedCacheHeaders) {
assert.equal(res.headers['x-cache-channel'], expectedCacheHeaders.x_cache_channel);
validateXChannelHeaders(res.headers, expectedCacheHeaders);
assert.equal(res.headers['surrogate-key'], expectedCacheHeaders.surrogate_keys);
}
@@ -159,6 +164,13 @@ describe('get requests with cache headers', function() {
};
}
function validateXChannelHeaders(headers, expectedCacheHeaders) {
var dbName = headers['x-cache-channel'].split(':')[0];
var tables = headers['x-cache-channel'].split(':')[1].split(',').sort();
assert.equal(dbName, expectedCacheHeaders.x_cache_channel.db_name);
assert.deepEqual(tables, expectedCacheHeaders.x_cache_channel.tables.sort());
}
function noCacheHeaders(done) {
return function(res, err) {
if (err) {