From f33c3ce21adef5692cb4c17b3375216419f8e665 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Fri, 25 Sep 2015 19:56:28 +0200
Subject: [PATCH] rmdirRecursiveSync DRY

---
 test/acceptance/ported/external_resources.js | 20 +++-----------------
 test/acceptance/ported/regressions.js        | 19 ++-----------------
 test/acceptance/ported/server.js             | 18 ++----------------
 test/acceptance/ported/server_gettile.js     | 19 ++-----------------
 test/support/test_helper.js                  | 17 ++++++++++++++++-
 5 files changed, 25 insertions(+), 68 deletions(-)

diff --git a/test/acceptance/ported/external_resources.js b/test/acceptance/ported/external_resources.js
index d3e18f15..a0affa83 100644
--- a/test/acceptance/ported/external_resources.js
+++ b/test/acceptance/ported/external_resources.js
@@ -1,4 +1,4 @@
-require('../../support/test_helper');
+var testHelper = require('../../support/test_helper');
 
 
 var assert = require('../../support/assert');
@@ -11,20 +11,6 @@ var nock = require('nock');
 
 var BaseController = require('../../../lib/cartodb/controllers/base');
 
-function rmdir_recursive_sync(dirname) {
-  var files = fs.readdirSync(dirname);
-  for (var i=0; i<files.length; ++i) {
-    var f = dirname + "/" + files[i];
-    var s = fs.lstatSync(f);
-    if ( s.isFile() ) {
-      fs.unlinkSync(f);
-    }
-    else {
-        rmdir_recursive_sync(f);
-    }
-  }
-}
-
 describe('external resources', function() {
 
     var res_serv; // resources server
@@ -60,7 +46,7 @@ describe('external resources', function() {
     after(function(done) {
         BaseController.prototype.req2params = req2paramsFn;
 
-        rmdir_recursive_sync(global.environment.millstone.cache_basedir);
+        testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir);
 
         // Close the resources server
         res_serv.close(done);
@@ -112,7 +98,7 @@ describe('external resources', function() {
                 assert.equal(res_serv_status.numrequests, externalResourceRequestsCount);
 
                 // reset resources cache
-                rmdir_recursive_sync(global.environment.millstone.cache_basedir);
+                testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir);
 
                 externalResourceMapConfig = testClient.defaultTableMapConfig('test_table_3 ', externalResourceStyle);
 
diff --git a/test/acceptance/ported/regressions.js b/test/acceptance/ported/regressions.js
index cb289700..66c1262f 100644
--- a/test/acceptance/ported/regressions.js
+++ b/test/acceptance/ported/regressions.js
@@ -1,26 +1,11 @@
-require('../../support/test_helper');
+var testHelper = require('../../support/test_helper');
 
 var assert = require('../../support/assert');
-var fs = require('fs');
 var ServerOptions = require('./support/ported_server_options');
 var testClient = require('./support/test_client');
 
 var BaseController = require('../../../lib/cartodb/controllers/base');
 
-function rmdir_recursive_sync(dirname) {
-  var files = fs.readdirSync(dirname);
-  for (var i=0; i<files.length; ++i) {
-    var f = dirname + "/" + files[i];
-    var s = fs.lstatSync(f);
-    if ( s.isFile() ) {
-      fs.unlinkSync(f);
-    }
-    else {
-        rmdir_recursive_sync(f);
-    }
-  }
-}
-
 describe('regressions', function() {
 
     var req2paramsFn;
@@ -32,7 +17,7 @@ describe('regressions', function() {
 
     after(function() {
         BaseController.prototype.req2params = req2paramsFn;
-        rmdir_recursive_sync(global.environment.millstone.cache_basedir);
+        testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir);
     });
 
     // See https://github.com/Vizzuality/Windshaft/issues/65
diff --git a/test/acceptance/ported/server.js b/test/acceptance/ported/server.js
index 18c14aa5..7d8f2e73 100644
--- a/test/acceptance/ported/server.js
+++ b/test/acceptance/ported/server.js
@@ -1,26 +1,12 @@
-require('../../support/test_helper');
+var testHelper = require('../../support/test_helper');
 
 var assert = require('../../support/assert');
-var fs = require('fs');
 var cartodbServer = require('../../../lib/cartodb/server');
 var ServerOptions = require('./support/ported_server_options');
 var testClient = require('./support/test_client');
 
 var BaseController = require('../../../lib/cartodb/controllers/base');
 
-function rmdir_recursive_sync(dirname) {
-  var files = fs.readdirSync(dirname);
-  for (var i=0; i<files.length; ++i) {
-    var f = dirname + "/" + files[i];
-    var s = fs.lstatSync(f);
-    if ( s.isFile() ) {
-      fs.unlinkSync(f);
-    } else {
-        rmdir_recursive_sync(f);
-    }
-  }
-}
-
 describe('server', function() {
 
     var server = cartodbServer(ServerOptions);
@@ -35,7 +21,7 @@ describe('server', function() {
     after(function() {
         BaseController.prototype.req2params = req2paramsFn;
 
-        rmdir_recursive_sync(global.environment.millstone.cache_basedir);
+        testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir);
     });
 
     ////////////////////////////////////////////////////////////////////
diff --git a/test/acceptance/ported/server_gettile.js b/test/acceptance/ported/server_gettile.js
index 6dc0ef4d..7dad9aa3 100644
--- a/test/acceptance/ported/server_gettile.js
+++ b/test/acceptance/ported/server_gettile.js
@@ -1,7 +1,6 @@
-require('../../support/test_helper');
+var testHelper = require('../../support/test_helper');
 
 var assert = require('../../support/assert');
-var fs = require('fs');
 var mapnik = require('windshaft').mapnik;
 var semver = require('semver');
 var cartodbServer = require('../../../lib/cartodb/server');
@@ -10,20 +9,6 @@ var testClient = require('./support/test_client');
 
 var BaseController = require('../../../lib/cartodb/controllers/base');
 
-function rmdir_recursive_sync(dirname) {
-  var files = fs.readdirSync(dirname);
-  for (var i=0; i<files.length; ++i) {
-    var f = dirname + "/" + files[i];
-    var s = fs.lstatSync(f);
-    if ( s.isFile() ) {
-      fs.unlinkSync(f);
-    }
-    else {
-        rmdir_recursive_sync(f);
-    }
-  }
-}
-
 describe('server_gettile', function() {
 
     var server = cartodbServer(ServerOptions);
@@ -41,7 +26,7 @@ describe('server_gettile', function() {
     after(function() {
         BaseController.prototype.req2params = req2paramsFn;
 
-        rmdir_recursive_sync(global.environment.millstone.cache_basedir);
+        testHelper.rmdirRecursiveSync(global.environment.millstone.cache_basedir);
     });
 
     function imageCompareFn(fixture, done) {
diff --git a/test/support/test_helper.js b/test/support/test_helper.js
index c83ecbef..e44916fd 100644
--- a/test/support/test_helper.js
+++ b/test/support/test_helper.js
@@ -6,6 +6,7 @@
  */
 
 var assert = require('assert');
+var fs = require('fs');
 var LZMA  = require('lzma').LZMA;
 
 var lzmaWorker = new LZMA();
@@ -135,12 +136,26 @@ function deleteRedisKeys(keysToDelete, callback) {
     });
 }
 
+function rmdirRecursiveSync(dirname) {
+    var files = fs.readdirSync(dirname);
+    for (var i=0; i<files.length; ++i) {
+        var f = dirname + "/" + files[i];
+        var s = fs.lstatSync(f);
+        if ( s.isFile() ) {
+            fs.unlinkSync(f);
+        }
+        else {
+            rmdirRecursiveSync(f);
+        }
+    }
+}
 
 module.exports = {
   deleteRedisKeys: deleteRedisKeys,
   lzma_compress_to_base64: lzma_compress_to_base64,
   checkNoCache: checkNoCache,
   checkSurrogateKey: checkSurrogateKey,
-  checkCache: checkCache
+  checkCache: checkCache,
+  rmdirRecursiveSync: rmdirRecursiveSync
 };