From 22623010bf4a515f63f9469e851056676f30dbab Mon Sep 17 00:00:00 2001 From: Silvano Luciani Date: Thu, 14 Aug 2014 10:25:21 -0700 Subject: [PATCH 1/2] refactor(storage): Use async in regression tests --- regression/storage.js | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/regression/storage.js b/regression/storage.js index 4a2c988c52d..d0333d4a074 100644 --- a/regression/storage.js +++ b/regression/storage.js @@ -118,18 +118,18 @@ describe('storage', function() { var fileConfig = { filename: pathToLogoFile }; var copyName = 'CloudLogoCopy'; - // TODO(silvano): Use async.parallel. bucket.write(fileName, fileConfig, function(err) { assert.ifError(err); bucket.copy(fileName, { name: copyName }, function() { assert.ifError(err); - bucket.remove(copyName, function(err) { - assert.ifError(err); - bucket.remove(fileName, function(err) { - assert.ifError(err); - done(); - }); - }); + async.parallel([ + function(callback) { + bucket.remove(fileName, callback); + }, + function(callback) { + bucket.remove(copyName, callback); + }, + ], done); }); }); }); @@ -175,18 +175,14 @@ describe('storage', function() { }); after(function(done) { - // TODO(silvano): Use Array.prototype.map to generate task array. - async.parallel([ - function(callback) { - bucket.remove(filenames[0], callback); - }, - function(callback) { - bucket.remove(filenames[1], callback); - }, - function(callback) { - bucket.remove(filenames[2], callback); - } - ], done); + async.parallel( + filenames.map( + function(filename) { + return function(callback) { + bucket.remove(filename, callback); + }; + } + ), done); }); }); }); From fea2551c4edee2d89fbc1343fb0b6a1ddf13d716 Mon Sep 17 00:00:00 2001 From: Silvano Luciani Date: Thu, 14 Aug 2014 10:35:08 -0700 Subject: [PATCH 2/2] style(storage): indentation fix --- regression/storage.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/regression/storage.js b/regression/storage.js index d0333d4a074..b877624b362 100644 --- a/regression/storage.js +++ b/regression/storage.js @@ -176,13 +176,11 @@ describe('storage', function() { after(function(done) { async.parallel( - filenames.map( - function(filename) { - return function(callback) { - bucket.remove(filename, callback); - }; - } - ), done); + filenames.map(function(filename) { + return function(callback) { + bucket.remove(filename, callback); + }; + }), done); }); }); });