biz-a-cli 2.3.66 → 2.3.68

package/bin/app.js

@@ -5,7 +5,7 @@ import axios from "axios"
 import fs from "fs"
 import * as tar from "tar"
 import { verify, sign, privateDecrypt, constants as cryptoConstants } from "node:crypto"
-import { basename } from "node:path"
+import path, { basename } from "node:path"
 import { env } from "../envs/env.js"
 import { prepareScript, encryptScript } from "./script.js"
 import { spawn } from "node:child_process"
@@ -124,11 +124,33 @@ Object
         }
 
         async function runUnitTests() {  //SCY BZ 4331
-            process.chdir(options.workingDir)
+            let jestCommand = ['--no-install', 'jest', '--json'];
+            let output = '';
 
-            const child = spawn('npx', ['jest'], { stdio: 'inherit', shell: true });
-            child.on('close', async (code) => {
-                if (code == 0) {
+            const testDir = path.join(options.workingDir, "test");
+            const workDir = path.resolve(options.workingDir);
+            try {
+                process.chdir(testDir)
+            } catch (error) {
+                if (error.code === 'ENOENT') {
+                    jestCommand.push('--passWithNoTests')
+                }
+            }
+            process.chdir(workDir);
+
+            const child = spawn('npx', jestCommand, { shell: true });
+            child.stderr.on('data', data => output += data?.toString())
+            child.on('close', async code => {
+                console.log('====================');
+                console.log(output);
+                console.log('====================');
+                let noTestsFound = output.includes('No tests found');
+                let missingJest = (output.includes('missing packages') && output.includes('jest'));
+                let passWithNoTests = jestCommand.includes('--passWithNoTests');
+
+                if ((code == 0) ||
+                    ((code == 1) && noTestsFound) ||
+                    ((code == 1) && missingJest && passWithNoTests)) {
                     await addApp()
                 } else {
                     console.error('Biz-A Add aborted');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "biz-a-cli",
   "nameDev": "biz-a-cli-dev",
-  "version": "2.3.66",
+  "version": "2.3.68",
   "versionDev": "0.0.34",
   "description": "",
   "main": "bin/index.js",

package/tests/app.test.js

@@ -5,10 +5,14 @@ import { finished } from 'node:stream/promises'
 import { createDecipheriv } from 'node:crypto'
 import * as tar from "tar"
 import { env } from "../envs/env.js"
+import path from "node:path"
 
 describe('Biz-A Apps CLI', () => {
     let originalOptions, originalCWD, axios, child_process;
+
+    const JEST_MESSAGE_TOTAL = 3;
     let returnedCode = 0;
+    let jestMessage = '';
 
     const logSpy = jest.spyOn(global.console, 'log').mockImplementation()
     const errorSpy = jest.spyOn(global.console, 'error').mockImplementation()
@@ -41,12 +45,15 @@ describe('Biz-A Apps CLI', () => {
         jest.unstable_mockModule('node:child_process', () => ({
             spawn: jest.fn().mockReturnValue({
                 on: jest.fn((event, callback) => {
-                    if (event === "close") {
-                        callback(returnedCode);
-                    }
-                })
+                    if (event === "close") callback(returnedCode)
+                }),
+                stderr: {
+                    on: jest.fn((event, callback) => {
+                        if (event === "data") callback(jestMessage)
+                    })
+                }
             })
-        }));
+        }))
         child_process = (await import('node:child_process'));
     })
 
@@ -242,8 +249,8 @@ describe('Biz-A Apps CLI', () => {
 
             expect(postArgs[2]).toStrictEqual({ "headers": { "Content-Type": "text/plain" } })
 
-            expect(logSpy.mock.calls[0][0]).toContain(`Finished packing ${Object.keys(mockScripts).length} files into "./upload/${appName.toLowerCase()}.tgz"`)
-            expect(logSpy.mock.calls[1][0]).toContain(`Finished uploading "./upload/${appName.toLocaleLowerCase()}.tgz"`)
+            expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 0][0]).toContain(`Finished packing ${Object.keys(mockScripts).length} files into "./upload/${appName.toLowerCase()}.tgz"`)
+            expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 1][0]).toContain(`Finished uploading "./upload/${appName.toLocaleLowerCase()}.tgz"`)
 
             // fs.rmSync(mockDataFolder + '/' + appName, {recursive: true, force: true})
         })
@@ -303,12 +310,12 @@ describe('Biz-A Apps CLI', () => {
                 'Invalid script syntax',
                 { act: 'get = function () {return {modelA: {}}' }, // missing close closure at the end',
                 () => {
-                    expect(logSpy.mock.calls.length).toBe(5)
-                    expect(logSpy.mock.calls[0][0]).toBe('===================\nA.JS\n===================')
-                    expect(logSpy.mock.calls[1][0]).toBe('Running script with VM') // node sandbox (VN) error as console.log
-                    expect(logSpy.mock.calls[2][0]).toStrictEqual('a.js:1:38: SyntaxError: Unexpected token: eof, expected: punc «}»')
-                    expect(logSpy.mock.calls[3][0]).toStrictEqual('Running script with Import function')
-                    expect(logSpy.mock.calls[4][0]).toStrictEqual('===================\nEOF A.JS\n===================')
+                    expect(logSpy.mock.calls.length).toBe(JEST_MESSAGE_TOTAL + 5)
+                    expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 0][0]).toBe('===================\nA.JS\n===================')
+                    expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 1][0]).toBe('Running script with VM') // node sandbox (VN) error as console.log
+                    expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 2][0]).toStrictEqual('a.js:1:38: SyntaxError: Unexpected token: eof, expected: punc «}»')
+                    expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 3][0]).toStrictEqual('Running script with Import function')
+                    expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 4][0]).toStrictEqual('===================\nEOF A.JS\n===================')
 
                     expect(errorSpy.mock.calls.length).toBe(1)
                     expect(errorSpy.mock.calls[0][0]).toBe('a.js : SyntaxError: Unexpected end of input')
@@ -318,13 +325,13 @@ describe('Biz-A Apps CLI', () => {
                 'Failed to compile script with node sandbox and ES6 Import',
                 { act: 'get = function () {return {modelA: {}}}\n modul.expor = get;\n' }, // wrong "module.export"
                 () => {
-                    expect(logSpy.mock.calls.length).toBe(6)
-                    expect(logSpy.mock.calls[0][0]).toBe('===================\nA.JS\n===================')
-                    expect(logSpy.mock.calls[1][0]).toBe('Running script with VM') // node sandbox (VN) error as console.log
-                    expect(logSpy.mock.calls[2][0]).toBe('Minify : \nget=function(){return{modelA:{}}};modul.expor=get;')
-                    expect(logSpy.mock.calls[3][0]).toBe("a.js : ReferenceError: modul is not defined")
-                    expect(logSpy.mock.calls[4][0]).toBe('Running script with Import function')
-                    expect(logSpy.mock.calls[5][0]).toStrictEqual('===================\nEOF A.JS\n===================')
+                    expect(logSpy.mock.calls.length).toBe(JEST_MESSAGE_TOTAL + 6)
+                    expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 0][0]).toBe('===================\nA.JS\n===================')
+                    expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 1][0]).toBe('Running script with VM') // node sandbox (VN) error as console.log
+                    expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 2][0]).toBe('Minify : \nget=function(){return{modelA:{}}};modul.expor=get;')
+                    expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 3][0]).toBe("a.js : ReferenceError: modul is not defined")
+                    expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 4][0]).toBe('Running script with Import function')
+                    expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 5][0]).toStrictEqual('===================\nEOF A.JS\n===================')
 
                     expect(errorSpy.mock.calls.length).toBe(1)
                     expect(errorSpy.mock.calls[0][0]).toStrictEqual('a.js : Error: Invalid data URI')// ES6 import error
@@ -334,12 +341,12 @@ describe('Biz-A Apps CLI', () => {
                 'Shall not allow empty script',
                 { act: 'get = function () {}' }, // empty script
                 () => {
-                    expect(logSpy.mock.calls.length).toBe(5)
-                    expect(logSpy.mock.calls[0][0]).toBe('===================\nA.JS\n===================')
-                    expect(logSpy.mock.calls[1][0]).toBe('Running script with VM') // node sandbox (VN) error as console.log
-                    expect(logSpy.mock.calls[2][0]).toBe('Minify : \nget=function(){};')
-                    expect(logSpy.mock.calls[3][0]).toBe('Running script with Import function')
-                    expect(logSpy.mock.calls[4][0]).toStrictEqual('===================\nEOF A.JS\n===================')
+                    expect(logSpy.mock.calls.length).toBe(JEST_MESSAGE_TOTAL + 5)
+                    expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 0][0]).toBe('===================\nA.JS\n===================')
+                    expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 1][0]).toBe('Running script with VM') // node sandbox (VN) error as console.log
+                    expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 2][0]).toBe('Minify : \nget=function(){};')
+                    expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 3][0]).toBe('Running script with Import function')
+                    expect(logSpy.mock.calls[JEST_MESSAGE_TOTAL + 4][0]).toStrictEqual('===================\nEOF A.JS\n===================')
 
                     expect(errorSpy.mock.calls.length).toBe(1)
                     expect(errorSpy.mock.calls[0][0]).toStrictEqual('a.js : Failed to compile template script.\nPlease make sure the script is correct and not returning empty result')
@@ -359,7 +366,7 @@ describe('Biz-A Apps CLI', () => {
             mockIssuerKeyResponse()
             await runCommand('add', '-s', 'https://a.b.c', '-p', '1205', '-i', '2', '-d', mockDataFolder + '/' + expect.getState().currentTestName, "-v")
 
-            expect(logSpy.mock.calls.length).toBe(0)
+            expect(logSpy.mock.calls.length).toBe(JEST_MESSAGE_TOTAL + 0)
 
             expect(errorSpy.mock.calls.length).toBe(1)
             expect(errorSpy.mock.calls[0][0]).toBe('Nothing to upload. Please recheck your app folder.')
@@ -389,9 +396,7 @@ describe('Biz-A Apps CLI', () => {
             expect(errorSpy.mock.calls[errorSpy.mock.calls.length - 1][0]).toBe('Unknown argument: Unknown Command')
         })
 
-        it('Shall not continue add biz a template if code is not zero', async () => {  //SCY BZ 4331
-            returnedCode = 1;
-
+        describe('run Jest', () => {  //SCY BZ 4331
             const mockScripts = {
                 'a.js': {
                     act: 'get = function () {return {modelA: {}}}',
@@ -399,13 +404,138 @@ describe('Biz-A Apps CLI', () => {
                 }
             }
             const appName = 'compressStressTest1';
-            const oldCwd = process.cwd();
-            mockValidTemplates(appName, mockScripts);
-            await runCommand('add', '-s', 'https://a.b.c', '-p', '1205', '-i', '2', '-d', mockDataFolder + '/' + appName)
+            const fullTestPath = mockDataFolder + appName;
+            const absoluteFullTestPath = path.resolve(fullTestPath);
+
+            let jestArgs = ['--no-install', 'jest', '--json'];
+            let jestArgsWithPassNoTest = jestArgs.slice();
+            jestArgsWithPassNoTest.push('--passWithNoTests');
+
+            async function runJest() {
+                mockIssuerKeyResponse();
+                await runCommand('add', '-s', 'https://a.b.c', '-p', '1205', '-i', '2', '-d', fullTestPath)
+            }
+
+            function continueExpect(args) {
+                expect(process.cwd()).toBe(absoluteFullTestPath);
+                expect(child_process.spawn).toBeCalledWith("npx", args, { "shell": true });
+                expect(logSpy.mock.calls[logSpy.mock.calls.length - JEST_MESSAGE_TOTAL - 2][0]).toBe('====================');
+                expect(logSpy.mock.calls[logSpy.mock.calls.length - JEST_MESSAGE_TOTAL - 1][0]).toBe(jestMessage);
+                expect(logSpy.mock.calls[logSpy.mock.calls.length - JEST_MESSAGE_TOTAL][0]).toBe('====================');
+                expect(errorSpy.mock.calls.length).toBe(0);
+            }
+
+            function abortExpect(args) {
+                expect(process.cwd()).toBe(absoluteFullTestPath);
+                expect(child_process.spawn).toBeCalledWith("npx", args, { "shell": true });
+                expect(logSpy.mock.calls[logSpy.mock.calls.length - JEST_MESSAGE_TOTAL][0]).toBe('====================');
+                expect(logSpy.mock.calls[logSpy.mock.calls.length - JEST_MESSAGE_TOTAL + 1][0]).toBe(jestMessage);
+                expect(logSpy.mock.calls[logSpy.mock.calls.length - JEST_MESSAGE_TOTAL + 2][0]).toBe('====================');
+                expect(errorSpy.mock.calls[errorSpy.mock.calls.length - 1][0]).toBe('Biz-A Add aborted');
+            }
+
+            it('Shall continue add biz a template, jest found, folder test found, unit test found, unit test passed', async () => {
+                returnedCode = 0;
+                jestMessage = 'Passed';
+
+                mockValidTemplates(appName, mockScripts);
+                fs.mkdirSync(fullTestPath + '/test', { recursive: true })
+                fs.writeFileSync(fullTestPath + '/test/a.test.js', `it('dummy test', () => {
+    expect(true).toBe(true);
+})`)
+
+                await runJest();
+                continueExpect(jestArgs);
+            })
+
+            it('Shall abort add biz a template, jest found, folder test found, unit test found, unit test failed', async () => {
+                returnedCode = 1;
+                jestMessage = 'FAIL';
+
+                mockValidTemplates(appName, mockScripts);
+                fs.mkdirSync(fullTestPath + '/test', { recursive: true })
+                fs.writeFileSync(fullTestPath + '/test/a.test.js', `it('dummy test', () => {
+    expect(true).toBe(false);
+})`)
+
+                await runJest();
 
-            expect(process.cwd()).toStrictEqual(`${oldCwd}${mockDataFolder.split('.')[1].replaceAll('/', '\\')}${appName}`);
-            expect(child_process.spawn).toBeCalledWith("npx", ["jest"], { "shell": true, "stdio": "inherit" });
-            expect(errorSpy.mock.calls[errorSpy.mock.calls.length - 1][0]).toBe('Biz-A Add aborted');
+                abortExpect(jestArgs);
+            })
+
+            it('Shall continue add biz a template, jest found, folder test found, no unit test', async () => {
+                returnedCode = 1;
+                jestMessage = 'No tests found';
+
+                mockValidTemplates(appName, mockScripts);
+                fs.mkdirSync(fullTestPath + '/test', { recursive: true })
+
+                await runJest();
+
+                continueExpect(jestArgs);
+            })
+
+            it('Shall continue add biz a template, jest found, no folder test', async () => {
+                returnedCode = 0;
+                jestMessage = 'No tests found';
+
+                mockValidTemplates(appName, mockScripts);
+                await runJest();
+
+                continueExpect(jestArgsWithPassNoTest);
+            })
+
+            it('Shall abort add biz a template, no jest found, folder test found, unit test found, unit test passed', async () => {
+                returnedCode = 1;
+                jestMessage = 'missing packages jest';
+
+                mockValidTemplates(appName, mockScripts);
+                fs.mkdirSync(fullTestPath + '/test', { recursive: true })
+                fs.writeFileSync(fullTestPath + '/test/a.test.js', `it('dummy test', () => {
+    expect(true).toBe(true);
+})`)
+
+                await runJest();
+
+                abortExpect(jestArgs);
+            })
+
+            it('Shall abort add biz a template, no jest found, folder test found, unit test found, unit test failed', async () => {
+                returnedCode = 1;
+                jestMessage = 'missing packages jest';
+
+                mockValidTemplates(appName, mockScripts);
+                fs.mkdirSync(fullTestPath + '/test', { recursive: true })
+                fs.writeFileSync(fullTestPath + '/test/a.test.js', `it('dummy test', () => {
+    expect(true).toBe(false);
+})`)
+
+                await runJest();
+
+                abortExpect(jestArgs);
+            })
+
+            it('Shall abort add biz a template, no jest found, folder test found, no unit test', async () => {
+                returnedCode = 1;
+                jestMessage = 'missing packages jest';
+
+                mockValidTemplates(appName, mockScripts);
+                fs.mkdirSync(fullTestPath + '/test', { recursive: true })
+
+                await runJest();
+
+                abortExpect(jestArgs);
+            })
+
+            it('Shall continue add biz a template, no jest found, no folder test', async () => {
+                returnedCode = 1;
+                jestMessage = 'missing packages jest';
+
+                mockValidTemplates(appName, mockScripts);
+                await runJest();
+
+                continueExpect(jestArgsWithPassNoTest);
+            })
         })
     })