From 1b1120617418f7152bc9d63f5a643b2fa19f0179 Mon Sep 17 00:00:00 2001 From: Norman Breau Date: Sat, 7 Sep 2019 01:54:33 -0300 Subject: [PATCH] fix: clean command (#815) * fix clean command * added unit tests for the getArgs clean * Cleaned up ProjectBuilder.getArgs for readability --- .../cordova/lib/builders/ProjectBuilder.js | 3 +-- spec/unit/builders/ProjectBuilder.spec.js | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/bin/templates/cordova/lib/builders/ProjectBuilder.js b/bin/templates/cordova/lib/builders/ProjectBuilder.js index 35ce906b..4db8bec4 100644 --- a/bin/templates/cordova/lib/builders/ProjectBuilder.js +++ b/bin/templates/cordova/lib/builders/ProjectBuilder.js @@ -45,8 +45,8 @@ class ProjectBuilder { getArgs (cmd, opts) { let args; + let buildCmd = cmd; if (opts.packageType === PackageType.BUNDLE) { - let buildCmd; if (cmd === 'release') { buildCmd = ':app:bundleRelease'; } else if (cmd === 'debug') { @@ -55,7 +55,6 @@ class ProjectBuilder { args = [buildCmd, '-b', path.join(this.root, 'build.gradle')]; } else { - let buildCmd; if (cmd === 'release') { buildCmd = 'cdvBuildRelease'; } else if (cmd === 'debug') { diff --git a/spec/unit/builders/ProjectBuilder.spec.js b/spec/unit/builders/ProjectBuilder.spec.js index 44769b5d..7104271e 100644 --- a/spec/unit/builders/ProjectBuilder.spec.js +++ b/spec/unit/builders/ProjectBuilder.spec.js @@ -100,6 +100,20 @@ describe('ProjectBuilder', () => { expect(args).toContain(`-PcdvBuildArch=${arch}`); }); + + it('should clean apk', () => { + const args = builder.getArgs('clean', { + packageType: 'apk' + }); + expect(args[0]).toBe('clean'); + }); + + it('should clean bundle', () => { + const args = builder.getArgs('clean', { + packageType: 'bundle' + }); + expect(args[0]).toBe('clean'); + }); }); describe('runGradleWrapper', () => {