From eebd89aedb86f482b3479893422032f413bb7900 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Fri, 25 Sep 2015 14:35:58 +0200
Subject: [PATCH] Remove redis keys after each test

---
 test/acceptance/ported/attributes.js | 64 +++++++++-------------------
 1 file changed, 21 insertions(+), 43 deletions(-)

diff --git a/test/acceptance/ported/attributes.js b/test/acceptance/ported/attributes.js
index ddccb814..951a9e03 100644
--- a/test/acceptance/ported/attributes.js
+++ b/test/acceptance/ported/attributes.js
@@ -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);
             }
         );
     });