From d36ccb2602821fcf19da797112797ad0a4178d7e Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Fri, 25 Sep 2015 19:05:37 +0200 Subject: [PATCH] Adapts tests to after test client changes --- test/acceptance/ported/blend.js | 4 ---- test/acceptance/ported/blend_filtering.js | 4 ---- test/acceptance/ported/blend_http_fallback.js | 5 ----- test/acceptance/ported/external_resources.js | 15 +++------------ 4 files changed, 3 insertions(+), 25 deletions(-) diff --git a/test/acceptance/ported/blend.js b/test/acceptance/ported/blend.js index da605a45..d1c7ddfd 100644 --- a/test/acceptance/ported/blend.js +++ b/test/acceptance/ported/blend.js @@ -18,10 +18,6 @@ describe('blend png renderer', function() { BaseController.prototype.req2params = req2paramsFn; }); - afterEach(function(done) { - testHelper.deleteRedisKeys({'user:localhost:mapviews:global': 5}, done); - }); - var IMAGE_TOLERANCE_PER_MIL = 20; function plainTorqueMapConfig(plainColor) { diff --git a/test/acceptance/ported/blend_filtering.js b/test/acceptance/ported/blend_filtering.js index 9d6a1dea..bf259286 100644 --- a/test/acceptance/ported/blend_filtering.js +++ b/test/acceptance/ported/blend_filtering.js @@ -36,10 +36,6 @@ describe('blend layer filtering', function() { httpRendererResourcesServer.close(done); }); - afterEach(function(done) { - testHelper.deleteRedisKeys({'user:localhost:mapviews:global': 5}, done); - }); - var mapConfig = { version: '1.2.0', layers: [ diff --git a/test/acceptance/ported/blend_http_fallback.js b/test/acceptance/ported/blend_http_fallback.js index 1ff4cb7f..95ddc801 100644 --- a/test/acceptance/ported/blend_http_fallback.js +++ b/test/acceptance/ported/blend_http_fallback.js @@ -43,11 +43,6 @@ describe('blend http fallback', function() { httpRendererResourcesServer.close(done); }); - - afterEach(function(done) { - testHelper.deleteRedisKeys({'user:localhost:mapviews:global': 5}, done); - }); - var mapConfig = { version: '1.2.0', layers: [ diff --git a/test/acceptance/ported/external_resources.js b/test/acceptance/ported/external_resources.js index 2d33f5bf..d3e18f15 100644 --- a/test/acceptance/ported/external_resources.js +++ b/test/acceptance/ported/external_resources.js @@ -1,4 +1,4 @@ -var testHelper = require('../../support/test_helper'); +require('../../support/test_helper'); var assert = require('../../support/assert'); @@ -62,17 +62,8 @@ describe('external resources', function() { rmdir_recursive_sync(global.environment.millstone.cache_basedir); - testHelper.deleteRedisKeys({ - 'user:localhost:mapviews:global': 5 - }, function() { - // Close the resources server - res_serv.close(done); - }); - - }); - - afterEach(function(done) { - testHelper.deleteRedisKeys({'user:localhost:mapviews:global': 5}, done); + // Close the resources server + res_serv.close(done); }); function imageCompareFn(fixture, done) {