feat: SITES-29655 Remove import assistant related code from the helper

Author: atopper

package.json

@@ -42,14 +42,14 @@
     "esbuild": "^0.23.0",
     "express": "^4.21.0",
     "find-up": "^7.0.0",
+    "form-data": "4.0.1",
+    "inquirer": "12.2.0",
     "jsdom": "^25.0.1",
     "node-fetch": "^3.3.2",
     "ora": "^8.1.0",
     "puppeteer": "^23.1.0",
     "unzipper": "^0.12.3",
-    "yargs": "^17.7.2",
-    "form-data": "4.0.1",
-    "inquirer": "12.2.0"
+    "yargs": "^17.7.2"
   },
   "devDependencies": {
     "@eslint/js": "^9.13.0",

test/aem/downloadImages.test.js

@@ -13,13 +13,15 @@
 import fs from 'fs';
 import { expect, use } from 'chai';
 import sinon from 'sinon';
+import sinonChai from 'sinon-chai';
 import chaiAsPromised from 'chai-as-promised';
 import * as downloadImagesModule from '../../src/aem/downloadImages.js';
 import { downloadImagesInMarkdown } from '../../src/aem/downloadImages.js';
 import { Readable, Writable } from 'stream';
 import path from 'path';
 import { expectLogContains } from '../utils.js';
 
+use(sinonChai); // chai.use
 use(chaiAsPromised);
 
 describe('downloadImages.js', function () {
@@ -119,14 +121,14 @@ describe('downloadImages.js', function () {
       mkdirSyncStub.returns();
 
       downloadImagesModule.ensureDirSync('path/to/directory');
-      expect(mkdirSyncStub.calledWith('path/to/directory', { recursive: true })).to.equal(true);
+      expect(mkdirSyncStub).to.have.been.calledWith('path/to/directory', { recursive: true });
     });
 
     it('should log error if directory creation fails', () => {
       mkdirSyncStub.throws(new Error('Error creating directory'));
 
       downloadImagesModule.ensureDirSync('path/to/directory');
-      expect(consoleErrorStub.calledWith(sinon.match.string)).to.equal(true);
+      expect(consoleErrorStub).to.have.been.calledWith(sinon.match.string);
     });
   });
 
@@ -138,10 +140,10 @@ describe('downloadImages.js', function () {
         '/content/dam/image.jpg',
       );
 
-      expect(fetchStub.calledWith('http://example.com/image.jpg')).to.equal(true);
+      expect(fetchStub).to.have.been.calledWith('http://example.com/image.jpg');
 
       const finalPath = path.join(process.cwd(), 'image.jpg');
-      expect(createWriteStreamStub.calledWith(finalPath)).to.equal(true);
+      expect(createWriteStreamStub).to.have.been.calledWith(finalPath);
 
       // Ensure the image data was correctly written to the mock stream
       expect(imageData).to.equal('image data');
@@ -165,7 +167,7 @@ describe('downloadImages.js', function () {
         .to.be.rejectedWith('Failed to fetch http://example.com/image.jpg. Status: 404.');
 
       // there should be 5 retry attempts
-      expect(fetchStub.callCount).to.equal(5);
+      expect(fetchStub).to.have.callCount(5);
 
       // because the image fails to download, the error message should be logged
       expectLogContains(consoleErrorStub, 'Failed to download')
@@ -183,9 +185,9 @@ describe('downloadImages.js', function () {
 
       // test downloadImagesInMarkdown method
       await downloadImagesInMarkdown({ maxRetries: 3, downloadLocation: 'path/to/download' }, 'path/to/markdown.md');
-      expect(fetchStub.calledWith('http://example.com/image1.jpg')).to.equal(true);
-      expect(createWriteStreamStub.callCount).to.equal(3);
-      expect(createWriteStreamStub.called).to.equal(true);
+      expect(fetchStub).to.have.been.calledWith('http://example.com/image1.jpg');
+      expect(createWriteStreamStub).to.have.been.called;
+      expect(createWriteStreamStub).to.have.callCount(3);
     });
   });
 });

test/aem/uploadImages.test.js

@@ -12,11 +12,14 @@
 
 import fs from 'fs';
 import path from 'path';
-import { expect } from 'chai';
+import { expect, use } from 'chai';
 import sinon from 'sinon';
+import sinonChai from 'sinon-chai';
 import { FileSystemUpload, FileSystemUploadOptions } from '@adobe/aem-upload';
 import uploadImagesToAEM from '../../src/aem/uploadImages.js';
 
+use(sinonChai); // chai.use
+
 describe('uploadImages.js', function() {
   this.timeout(30000); // Increase timeout to 30 seconds
 
@@ -53,8 +56,8 @@ describe('uploadImages.js', function() {
 
       const result = await uploadImagesToAEM(opts);
 
-      expect(fileUploadStub.calledWith(sinon.match.instanceOf(FileSystemUploadOptions), [path.join(process.cwd(), 'test')])).to.equal(true);
-      expect(rmStub.calledWith(path.join(process.cwd(), 'test'), { recursive: true, force: true })).to.equal(true);
+      expect(fileUploadStub).to.have.been.calledWith(sinon.match.instanceOf(FileSystemUploadOptions), [path.join(process.cwd(), 'test')]);
+      expect(rmStub).to.have.been.calledWith(path.join(process.cwd(), 'test'), { recursive: true, force: true });
       expect(result).to.deep.equal({});
     });
 
@@ -84,7 +87,7 @@ describe('uploadImages.js', function() {
       };
 
       await expect(uploadImagesToAEM(opts)).to.be.rejectedWith('Upload error');
-      expect(consoleErrorStub.calledWith(sinon.match.string)).to.equal(true);
+      expect(consoleErrorStub).to.have.been.calledWith(sinon.match.string);
     });
   });
 });