From 80e42cb029d133b15026842b10925cab9272ed77 Mon Sep 17 00:00:00 2001 From: Gusten Andersson Date: Mon, 5 Nov 2018 14:03:07 +0100 Subject: [PATCH 1/5] Node 10 requires a callback to rmdir --- lib/phonegap-build/create/zip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/phonegap-build/create/zip.js b/lib/phonegap-build/create/zip.js index ab72acb..466b63a 100644 --- a/lib/phonegap-build/create/zip.js +++ b/lib/phonegap-build/create/zip.js @@ -116,7 +116,7 @@ module.exports = { // remove zip directory if empty exists = fs.existsSync(basepath); if (exists) { - fs.rmdir(basepath); + fs.rmdir(basepath, function () {}); } } }; From 9bb102a55658d5df8f508fb0ec585a9c41398fca Mon Sep 17 00:00:00 2001 From: Gusten Andersson Date: Mon, 5 Nov 2018 15:20:01 +0100 Subject: [PATCH 2/5] updated test --- spec/phonegap-build/zip.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/phonegap-build/zip.spec.js b/spec/phonegap-build/zip.spec.js index 9a9020a..6dfc881 100644 --- a/spec/phonegap-build/zip.spec.js +++ b/spec/phonegap-build/zip.spec.js @@ -249,7 +249,7 @@ describe('zip', function() { it('should try to remove zip directory', function() { zip.cleanup('build/www.zip'); - expect(fs.rmdir).toHaveBeenCalledWith('build'); + expect(fs.rmdir).toHaveBeenCalledWith('build', function () {}); }); }); From 58aff67b8fae4538248612c2ad8313aec30142ff Mon Sep 17 00:00:00 2001 From: Gusten Andersson Date: Mon, 5 Nov 2018 15:36:50 +0100 Subject: [PATCH 3/5] learned a bit jasmine --- spec/phonegap-build/zip.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/phonegap-build/zip.spec.js b/spec/phonegap-build/zip.spec.js index 6dfc881..15c854e 100644 --- a/spec/phonegap-build/zip.spec.js +++ b/spec/phonegap-build/zip.spec.js @@ -249,7 +249,7 @@ describe('zip', function() { it('should try to remove zip directory', function() { zip.cleanup('build/www.zip'); - expect(fs.rmdir).toHaveBeenCalledWith('build', function () {}); + expect(fs.rmdir).toHaveBeenCalledWith('build', jasmine.any(Function)); }); }); From 89f107591a05eb54fb9927022c816e29bef72769 Mon Sep 17 00:00:00 2001 From: Gusten Andersson Date: Tue, 6 Nov 2018 10:06:16 +0100 Subject: [PATCH 4/5] Changed to rmdirSync --- lib/phonegap-build/create/zip.js | 2 +- spec/phonegap-build/zip.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/phonegap-build/create/zip.js b/lib/phonegap-build/create/zip.js index 466b63a..bba3f7c 100644 --- a/lib/phonegap-build/create/zip.js +++ b/lib/phonegap-build/create/zip.js @@ -116,7 +116,7 @@ module.exports = { // remove zip directory if empty exists = fs.existsSync(basepath); if (exists) { - fs.rmdir(basepath, function () {}); + fs.rmdirSync(basepath); } } }; diff --git a/spec/phonegap-build/zip.spec.js b/spec/phonegap-build/zip.spec.js index 15c854e..054bd79 100644 --- a/spec/phonegap-build/zip.spec.js +++ b/spec/phonegap-build/zip.spec.js @@ -249,7 +249,7 @@ describe('zip', function() { it('should try to remove zip directory', function() { zip.cleanup('build/www.zip'); - expect(fs.rmdir).toHaveBeenCalledWith('build', jasmine.any(Function)); + expect(fs.rmdirSync).toHaveBeenCalledWith('build'); }); }); From e52f796c5b31bbd6568960cbdd03fde1f426d103 Mon Sep 17 00:00:00 2001 From: Gusten Andersson Date: Tue, 6 Nov 2018 10:09:57 +0100 Subject: [PATCH 5/5] tests... --- spec/phonegap-build/zip.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/phonegap-build/zip.spec.js b/spec/phonegap-build/zip.spec.js index 054bd79..51f3d0c 100644 --- a/spec/phonegap-build/zip.spec.js +++ b/spec/phonegap-build/zip.spec.js @@ -215,7 +215,7 @@ describe('zip', function() { describe('cleanup(zipPath)', function() { beforeEach(function() { spyOn(fs, 'existsSync'); - spyOn(fs, 'rmdir'); + spyOn(fs, 'rmdirSync'); spyOn(shell, 'rm'); });