Improve test coverage

package.json

@@ -28,14 +28,15 @@
   },
   "devDependencies": {
     "@adobe/eslint-config-aio-lib-config": "^4.0.0",
+    "@inquirer/testing": "^2.1.19",
     "@oclif/dev-cli": "^1.26.10",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "jest": "^29.7.0",
     "mocha": "^10.3.0",
     "nyc": "^15.1.0",
     "prettier": "^3.2.5",
+    "proxyquire": "^2.1.3",
     "sinon": "^17.0.1"
   },
   "bin": {
@@ -79,4 +80,4 @@
       }
     }
   }
-}
+}

src/lib/doRequest.js

@@ -88,9 +88,7 @@ class DoRequest {
       options.body = JSON.stringify(body);
       options.headers['content-type'] = 'application/json';
     }
-
-    const ret = fetch(url, options);
-    return ret;
+    return fetch(url, options);
   }
 }
 

src/lib/rde-utils.js

@@ -89,7 +89,6 @@ async function throwOnInstallError(cloudSdkAPI, updateId, progressCallback) {
     () => progressCallback(false, 'checking status')
   );
   progressCallback(true);
-
   if (response.status === 200) {
     const change = await response.json();
     if (change) {

test/commands/aem/rde/reset.test.js

@@ -1,23 +1,50 @@
 const assert = require('assert');
 const sinon = require('sinon').createSandbox();
-const ResetCommand = require('../../../../src/commands/aem/rde/reset.js');
 const { setupLogCapturing, createCloudSdkAPIStub } = require('../../../util');
 const { cli } = require('../../../../src/lib/base-command');
+const ResetCommand = require('../../../../src/commands/aem/rde/reset.js');
+
+const spinnerStartStub = sinon.stub();
+const spinnerStopStub = sinon.stub();
 
 describe('ResetCommand', function () {
   setupLogCapturing(sinon, cli);
 
   describe('#run', function () {
-    it('cloudSDKAPI.resetEnv() has been called', async function () {
-      const [command, cloudSdkApiStub] = createCloudSdkAPIStub(
+    let command;
+    let cloudSdkApiStub;
+    beforeEach(function () {
+      [command, cloudSdkApiStub] = createCloudSdkAPIStub(
         sinon,
         new ResetCommand([], null),
         {
           resetEnv: () => {},
         }
       );
+      Object.assign(command, {
+        spinnerStart: spinnerStartStub,
+        spinnerStop: spinnerStopStub,
+      });
+    });
+    afterEach(function () {
+      spinnerStartStub.reset();
+      spinnerStopStub.reset();
+    });
+    it('cloudSDKAPI.resetEnv() has been called', async function () {
       await command.run();
       assert.ok(cloudSdkApiStub.resetEnv.calledOnce);
+      assert.ok(spinnerStartStub.calledOnce);
+    });
+    it('stop the spinner and throw error', async function () {
+      let err;
+      try {
+        spinnerStartStub.throws(new Error('Failed to start a spinner'));
+        await command.run();
+      } catch (e) {
+        err = e;
+      }
+      assert.ok(spinnerStopStub.calledOnce);
+      assert.equal(err.code, 'INTERNAL_RESET_ERROR');
     });
   });
 

test/commands/aem/rde/status.test.js

@@ -1,9 +1,12 @@
 const assert = require('assert');
 const sinon = require('sinon').createSandbox();
-const StatusCommand = require('../../../../src/commands/aem/rde/status.js');
 const { cli } = require('../../../../src/lib/base-command.js');
 const Config = require('@adobe/aio-lib-core-config');
 const { setupLogCapturing, createCloudSdkAPIStub } = require('../../../util');
+const StatusCommand = require('../../../../src/commands/aem/rde/status.js');
+
+const spinnerStartStub = sinon.stub();
+const spinnerStopStub = sinon.stub();
 
 const stubbedMethods = {
   getArtifacts: () =>
@@ -30,6 +33,12 @@ const stubbedMethods = {
     }),
 };
 
+const stubbeErrorMethods = {
+  getArtifacts: () => {
+    throw new Error('failed to get artifacts');
+  },
+};
+
 let command, cloudSdkApiStub;
 describe('StatusCommand', function () {
   setupLogCapturing(sinon, cli);
@@ -58,6 +67,15 @@ describe('StatusCommand', function () {
         new StatusCommand([], null),
         stubbedMethods
       );
+      Object.assign(command, {
+        spinnerStart: spinnerStartStub,
+        spinnerStop: spinnerStopStub,
+      });
+    });
+
+    afterEach(function () {
+      spinnerStartStub.reset();
+      spinnerStopStub.reset();
     });
 
     it('should call getArtifacts() exactly once', async function () {
@@ -164,4 +182,40 @@ describe('StatusCommand', function () {
       );
     });
   });
+  describe('#run exceptions', function () {
+    it('should stop spinner when error occurs for text mode', async function () {
+      [command, cloudSdkApiStub] = createCloudSdkAPIStub(
+        sinon,
+        new StatusCommand([], null),
+        stubbeErrorMethods
+      );
+      Object.assign(command, {
+        spinnerStart: spinnerStartStub,
+        spinnerStop: spinnerStopStub,
+      });
+      let err;
+      try {
+        await command.run();
+      } catch (e) {
+        err = e;
+      }
+      assert.ok(spinnerStopStub.calledOnce);
+      assert.equal(err.code, 'INTERNAL_STATUS_ERROR');
+    });
+    it('should stop spinner when error occurs for json mode', async function () {
+      [command, cloudSdkApiStub] = createCloudSdkAPIStub(
+        sinon,
+        new StatusCommand(['--json'], null),
+        stubbeErrorMethods
+      );
+      Object.assign(command, {
+        spinnerStart: spinnerStartStub,
+        spinnerStop: spinnerStopStub,
+      });
+      try {
+        await command.run();
+      } catch (e) {}
+      assert.ok(spinnerStopStub.calledOnce);
+    });
+  });
 });

test/lib/base-command.test.js

@@ -26,6 +26,8 @@ const { codes: validationCodes } = require('../../src/lib/validation-errors');
 const assert = require('assert');
 const sinon = require('sinon').createSandbox();
 const { setupLogCapturing } = require('../util.js');
+const proxyquire = require('proxyquire').noCallThru();
+const jwt = require('jsonwebtoken');
 
 describe('BaseCommand catch errors', function () {
   let errorSpy;
@@ -185,3 +187,134 @@ describe('BaseCommand catch errors', function () {
     );
   });
 });
+
+describe('Authentication tests', function () {
+  const accessToken = jwt.sign(
+    {
+      client_id: 'jwt_client_id',
+    },
+    'pKey',
+    {}
+  );
+  const getOrganizationsStub = sinon.stub();
+  const contextGetStub = sinon.stub();
+  const getTokenStub = sinon.stub();
+  const getConfigStub = sinon.stub();
+  const BaseCommandAuthMock = proxyquire('../../src/lib/base-command', {
+    '@adobe/aio-lib-ims': {
+      Ims: class Ims {
+        getOrganizations() {
+          return getOrganizationsStub();
+        }
+      },
+      context: {
+        get: contextGetStub,
+      },
+      getToken: getTokenStub,
+    },
+    '@adobe/aio-lib-core-config': {
+      get: getConfigStub,
+      set: sinon.stub(),
+    },
+    '@adobe/aio-lib-cloudmanager': {
+      init: () => ({
+        getDeveloperConsoleUrl: () => 'http://example.com',
+      }),
+    },
+  });
+  beforeEach(function () {
+    getOrganizationsStub.returns(
+      Promise.resolve([
+        {
+          orgName: 'org1',
+          orgRef: { ident: 'org1_id', authSrc: 'org1_auth_src' },
+        },
+        {
+          orgName: 'org2',
+          orgRef: { ident: 'org2_id', authSrc: 'org2_auth_src' },
+        },
+      ])
+    );
+    contextGetStub.returns({
+      data: {
+        client_id: 'client_id',
+      },
+    });
+    getTokenStub.returns(accessToken);
+  });
+  afterEach(function () {
+    getOrganizationsStub.reset();
+    contextGetStub.reset();
+    getTokenStub.reset();
+    getConfigStub.reset();
+  });
+  it('should be able to fetch token and api key', async function () {
+    const command = new BaseCommandAuthMock.BaseCommand();
+    const result = await command.getTokenAndKey();
+    assert.deepEqual(result, {
+      accessToken,
+      apiKey: 'client_id',
+    });
+  });
+  it('should be able to fetch cli token and api key in case of api error', async function () {
+    contextGetStub.returns({});
+    const command = new BaseCommandAuthMock.BaseCommand();
+    const result = await command.getTokenAndKey();
+    assert.deepEqual(result, { accessToken, apiKey: 'jwt_client_id' });
+  });
+  it('should throw cannot decode error', async function () {
+    contextGetStub.returns({});
+    getTokenStub.returns(undefined);
+    let err;
+    try {
+      const command = new BaseCommandAuthMock.BaseCommand();
+      await command.getTokenAndKey();
+    } catch (e) {
+      err = e;
+    }
+    assert.equal(err.code, 'CLI_AUTH_CONTEXT_CANNOT_DECODE');
+  });
+  it('should throw no client id error', async function () {
+    contextGetStub.returns({});
+    getTokenStub.returns(jwt.sign({}, 'pKey', {}));
+    let err;
+    try {
+      const command = new BaseCommandAuthMock.BaseCommand();
+      await command.getTokenAndKey();
+    } catch (e) {
+      err = e;
+    }
+    assert.equal(err.code, 'CLI_AUTH_CONTEXT_NO_CLIENT_ID');
+  });
+  it('throw error on calling runCommand method', function () {
+    let err;
+    try {
+      const command = new BaseCommandAuthMock.BaseCommand();
+      command.runCommand();
+    } catch (e) {
+      err = e;
+    }
+    assert.equal(
+      err.message,
+      'You have to implement the method runCommand(args, flags) in the subclass!'
+    );
+  });
+  it('should return default base url', function () {
+    const command = new BaseCommandAuthMock.BaseCommand();
+    getConfigStub.returns(undefined);
+    const baseUrl = command.getBaseUrl();
+    assert.equal(baseUrl, 'https://cloudmanager.adobe.io');
+  });
+  it('cloud sdk should be initialized properly', async function () {
+    const command = new BaseCommandAuthMock.BaseCommand();
+    const flags = {
+      organizationId: 'orgId',
+      programId: 'progId',
+      environmentId: 'envId',
+    };
+    command.setupParams(flags);
+    const callbackStub = sinon.stub();
+    await command.withCloudSdk(callbackStub);
+    assert.ok(callbackStub.calledOnce);
+  });
+});