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

Remove redis keys after each test

Browse Source
This commit is contained in:
Raul Ochoa
2015-09-25 14:35:58 +02:00
parent a9573987ec
commit eebd89aedb
1 changed files with 21 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
test/acceptance/ported/attributes.js
View File

@@ -1,18 +1,18 @@
require('../../support/test_helper');
var testHelper = require('../../support/test_helper');
var assert = require('../../support/assert');
var redis = require('redis');
var step = require('step');
var cartodbServer = require('../../../lib/cartodb/server');
var PortedServerOptions = require('./support/ported_server_options');
var BaseController = require('../../../lib/cartodb/controllers/base');
var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token');
describe('attributes', function() {
var server = cartodbServer(PortedServerOptions);
server.setMaxListeners(0);
var redis_client = redis.createClient(PortedServerOptions.redis.port);
var test_mapconfig_1 = {
version: '1.1.0',
@@ -39,6 +39,18 @@ describe('attributes', function() {
assert.equal(res.headers['access-control-allow-origin'], '*');
}
var keysToDelete;
beforeEach(function() {
keysToDelete = {
'user:localhost:mapviews:global': 5
};
});
afterEach(function(done) {
testHelper.deleteRedisKeys(keysToDelete, done);
});
var req2paramsFn;
before(function() {
req2paramsFn = BaseController.prototype.req2params;
@@ -132,26 +144,9 @@ describe('attributes', function() {
return null;
},
function finish(err) {
var errors = [];
if ( err ) {
errors.push(''+err);
}
redis_client.exists("map_cfg|" + expected_token, function(err/*, exists*/) {
if ( err ) {
errors.push(err.message);
}
//assert.ok(exists, "Missing expected token " + expected_token + " from redis");
redis_client.del("map_cfg|" + expected_token, function(err) {
if ( err ) {
errors.push(err.message);
}
if ( errors.length ) {
done(new Error(errors));
} else {
done(null);
}
});
});
keysToDelete['map_cfg|' + LayergroupToken.parse(expected_token).token] = 0;
done(err);
}
);
});
@@ -258,26 +253,9 @@ describe('attributes', function() {
return null;
},
function finish(err) {
var errors = [];
if ( err ) {
errors.push(''+err);
}
redis_client.exists("map_cfg|" + expected_token, function(err/*, exists*/) {
if ( err ) {
errors.push(err.message);
}
//assert.ok(exists, "Missing expected token " + expected_token + " from redis");
redis_client.del("map_cfg|" + expected_token, function(err) {
if ( err ) {
errors.push(err.message);
}
if ( errors.length ) {
done(new Error(errors));
} else {
done(null);
}
});
});
keysToDelete['map_cfg|' + LayergroupToken.parse(expected_token).token] = 0;
done(err);
}
);
});