fix: minor package fixes (#152)

salesforcecli · Jul 26, 2021 · 5aa593d · 5aa593d
1 parent 65e5d24
commit 5aa593d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/formatters/retrieveResultFormatter.ts b/src/formatters/retrieveResultFormatter.ts
@@ -95,6 +95,7 @@ export class RetrieveResultFormatter extends ResultFormatter {
 
     // Display any package retrievals
     if (this.packages && this.packages.length) {
+      this.ux.log('');
       this.ux.styledHeader(blue('Retrieved Packages'));
       this.packages.forEach((pkg) => {
         this.ux.log(`${pkg.name} package converted and retrieved to: ${pkg.path}`);

diff --git a/test/formatters/retrieveResultFormatter.test.ts b/test/formatters/retrieveResultFormatter.test.ts
@@ -5,6 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
+import { join } from 'path';
 import * as sinon from 'sinon';
 import { expect } from 'chai';
 import { Logger } from '@salesforce/core';
@@ -78,14 +79,15 @@ describe('RetrieveResultFormatter', () => {
       expect(formatter.getJson()).to.deep.equal(expectedInProgressResults);
     });
 
-    it.skip('should return expected json for a success with packages', async () => {
+    it('should return expected json for a success with packages', async () => {
+      const testPkg = { name: 'testPkg', path: join('path', 'to', 'testPkg') };
       const expectedSuccessResults: RetrieveCommandResult = {
         inboundFiles: retrieveResultSuccess.getFileResponses(),
-        packages: [],
+        packages: [testPkg],
         warnings: [],
         response: cloneJson(retrieveResultSuccess.response),
       };
-      const formatter = new RetrieveResultFormatter(logger, ux, {}, retrieveResultSuccess);
+      const formatter = new RetrieveResultFormatter(logger, ux, { packages: [testPkg] }, retrieveResultSuccess);
       expect(formatter.getJson()).to.deep.equal(expectedSuccessResults);
     });
 
@@ -127,10 +129,11 @@ describe('RetrieveResultFormatter', () => {
         .and.contain(`${options.waitTime} minutes`);
     });
 
-    it.skip('should output as expected for a Failure', async () => {
-      const formatter = new RetrieveResultFormatter(logger, ux, {}, retrieveResultInProgress);
+    it('should output as expected for a Failure', async () => {
+      const formatter = new RetrieveResultFormatter(logger, ux, {}, retrieveResultFailure);
+      sandbox.stub(formatter, 'isSuccess').returns(false);
+
       formatter.display();
-      expect(styledHeaderStub.called).to.equal(true);
       expect(logStub.called).to.equal(true);
       expect(tableStub.called).to.equal(false);
       expect(logStub.firstCall.args[0]).to.contain('Retrieve Failed due to:');

diff --git a/test/nuts/seeds/retrieve.packagenames.seed.ts b/test/nuts/seeds/retrieve.packagenames.seed.ts
@@ -13,7 +13,7 @@ import { exec } from 'shelljs';
 const EXECUTABLE = '%EXECUTABLE%';
 
 const ELECTRON = { id: '04t6A000002zgKSQAY', name: 'ElectronBranding' };
-const SKUID = { id: '04t4A000000cESSQA2', name: 'Skuid' };
+const ESCAPEROOM = { id: '04t0P000000JFs1QAG', name: 'DFXP Escape Room' };
 
 context('Retrieve packagenames NUTs [exec: %EXECUTABLE%]', () => {
   let testkit: SourceTestkit;
@@ -47,10 +47,10 @@ context('Retrieve packagenames NUTs [exec: %EXECUTABLE%]', () => {
 
     it('should retrieve two installed packages', async () => {
       exec(`sfdx force:package:install --noprompt --package ${ELECTRON.id} --wait 5 --json`, { silent: true });
-      exec(`sfdx force:package:install --noprompt --package ${SKUID.id} --wait 5 --json`, { silent: true });
+      exec(`sfdx force:package:install --noprompt --package ${ESCAPEROOM.id} --wait 5 --json`, { silent: true });
 
-      await testkit.retrieve({ args: `--packagenames "${ELECTRON.name}, ${SKUID.name}"` });
-      await testkit.expect.packagesToBeRetrieved([ELECTRON.name, SKUID.name]);
+      await testkit.retrieve({ args: `--packagenames "${ELECTRON.name}, ${ESCAPEROOM.name}"` });
+      await testkit.expect.packagesToBeRetrieved([ELECTRON.name, ESCAPEROOM.name]);
     });
 
     it('should retrieve an installed package and sourcepath', async () => {