fix: fix tests

Author: btrn11

test/commands/package/packagePushUpgradeAbort.test.ts

@@ -6,7 +6,7 @@
  */
 
 import { Config } from '@oclif/core';
-import { TestContext, MockTestOrgData, sinon } from '@salesforce/core/testSetup';
+import { TestContext, MockTestOrgData } from '@salesforce/core/testSetup';
 import { expect } from 'chai';
 import { PackagePushUpgrade } from '@salesforce/packaging';
 import { SfCommand } from '@salesforce/sf-plugins-core';
@@ -45,7 +45,7 @@ describe('PackagePushUpgradeAbortCommand', () => {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     expect(logStub.callCount).to.equal(1);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    expect(logStub.args[0]).to.deep.equal([`Scheduled push upgrade ID ${pushRequestId} was canceled.`]);
+    expect(logStub.args[0]).to.deep.equal([`Scheduled push upgrade ID [${pushRequestId}] was cancelled.`]);
   });
 
   it('should throw an error if push-request-id is missing', async () => {

test/commands/package/packagePushUpgradeList.test.ts

@@ -61,7 +61,8 @@ describe('package:pushupgrade:list - tests', () => {
   });
 
   it('should list the push upgrade requests', async () => {
-    const cmd = new PackagePushRequestListCommand(['-v', testOrg.username], config);
+    const packageId = 'dummyPackageId';
+    const cmd = new PackagePushRequestListCommand(['-v', testOrg.username, '--package', packageId], config);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
     listStub.resolves(pushUpgradeListSuccess);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
@@ -83,7 +84,8 @@ describe('package:pushupgrade:list - tests', () => {
   });
 
   it('should handle no results found', async () => {
-    const cmd = new PackagePushRequestListCommand(['-v', testOrg.username], config);
+    const packageId = 'dummyPackageId';
+    const cmd = new PackagePushRequestListCommand(['-v', testOrg.username, '--package', packageId], config);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
     listStub.resolves([]);
 
@@ -95,7 +97,7 @@ describe('package:pushupgrade:list - tests', () => {
 
   it('should filter by is-migration flag', async () => {
     const packageId = '033XXXXXXXXXXXXXXX';
-    const cmdArgs = ['--target-dev-hub', testOrg.username, '--package', packageId, '--is-migration'];
+    const cmdArgs = ['--target-dev-hub', testOrg.username, '--package', packageId, '--show-push-migrations-only'];
     const cmd = new PackagePushRequestListCommand(cmdArgs, config);
 
     listStub.resolves(pushUpgradeListSuccess);

test/commands/package/packagePushUpgradeReport.test.ts

@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { Config } from '@oclif/core';
-import { TestContext, sinon } from '@salesforce/core/testSetup';
+import { TestContext } from '@salesforce/core/testSetup';
 import { expect } from 'chai';
 import {
   PackagePushUpgrade,
@@ -103,7 +103,15 @@ describe('package:pushupgrade:report - tests', () => {
     const cmd = new PackagePushUpgradeReportCommand(['-i', '0DVxx0000004EXTGA2', '-v', 'test@hub.org'], config);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
     reportStub.rejects(new Error('Report error'));
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    await expect(cmd.run()).to.be.rejectedWith('Report error');
+    try {
+      await cmd.run();
+      // If cmd.run() resolves, this line will be reached, and the test should fail.
+      expect.fail('Expected cmd.run() to reject, but it resolved.');
+    } catch (err) {
+      // Assert that an error was indeed thrown
+      expect(err).to.be.an.instanceof(Error);
+      // Assert the error message matches
+      expect((err as Error).message).to.equal('Report error');
+    }
   });
 });

test/commands/package/packagePushUpgradeSchedule.test.ts

@@ -4,7 +4,6 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import * as fs from 'node:fs/promises';
 import { Config } from '@oclif/core';
 import { TestContext, MockTestOrgData } from '@salesforce/core/testSetup';
 import * as sinon from 'sinon';
@@ -33,39 +32,12 @@ describe('package:pushupgrade:schedule - tests', () => {
     sfCommandStubs = stubSfCommandUx($$.SANDBOX);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     scheduleStub = $$.SANDBOX.stub(PackagePushUpgrade, 'schedule');
-    $$.SANDBOX.stub(fs, 'readFile').resolves('00Dxx0000001gEREAY\n00Dxx0000001gFAEA0');
   });
 
   afterEach(() => {
     $$.restore();
   });
 
-  it('should schedule the push upgrade with file', async () => {
-    const cmdArgsFile = [
-      '-p',
-      '04tXXXXXXXXXXXXXXX',
-      '-v',
-      testOrg.username,
-      '--start-time',
-      '2023-01-01T00:00:00Z',
-      '--org-list-file',
-      'valid-orgs.csv',
-    ];
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const cmd = new PackagePushScheduleCommand(cmdArgsFile, config);
-
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-    scheduleStub.resolves(pushReq);
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const result = await cmd.run();
-    expect(result).to.deep.equal(pushReq);
-
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    expect(sfCommandStubs.log.calledOnce).to.be.true;
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    expect(scheduleStub.calledOnce).to.be.true;
-  });
-
   it('should schedule the push upgrade with org input', async () => {
     const cmdArgsOrg = [
       '-p',