diff --git a/test/acceptance/ported/raster.js b/test/acceptance/ported/raster.js index b539b92a..00d34509 100644 --- a/test/acceptance/ported/raster.js +++ b/test/acceptance/ported/raster.js @@ -1,18 +1,17 @@ -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 ServerOptions = require('./support/ported_server_options'); var BaseController = require('../../../lib/cartodb/controllers/base'); +var LayergroupToken = require('../../../lib/cartodb/models/layergroup_token'); describe('raster', function() { var server = cartodbServer(ServerOptions); server.setMaxListeners(0); - var redis_client = redis.createClient(ServerOptions.redis.port); function checkCORSHeaders(res) { assert.equal(res.headers['access-control-allow-headers'], 'X-Requested-With, X-Prototype-Version, X-CSRF-Token'); @@ -98,26 +97,15 @@ describe('raster', function() { }); }, function finish(err) { - var errors = []; - if ( err ) { - errors.push(''+err); + if (err) { + return done(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); - } - }); - }); + + var keysToDelete = { + 'user:localhost:mapviews:global': 5 + }; + keysToDelete['map_cfg|' + LayergroupToken.parse(expected_token).token] = 0; + testHelper.deleteRedisKeys(keysToDelete, done); } ); });