fix: use process variable instead of hard coded sasjsbuild (#1328)

* chore: remove unused moveTestFile function * chore: remove unused function saveToDefaultLocation * fix: remove hard coded use of sasjsbuild * fix: convert file.js to file.ts and remove unused functions
sasjs · Mar 3, 2023 · aab2c4b · aab2c4b
1 parent 3320046
commit aab2c4b
Show file tree

Hide file tree

Showing 8 changed files with 124 additions and 274 deletions.
diff --git a/src/commands/compile/internal/compileTestFile.ts b/src/commands/compile/internal/compileTestFile.ts
@@ -30,10 +30,6 @@ import {
   getLocalOrGlobalConfig
 } from '../../../utils/config'
 
-const testsBuildFolder = () => {
-  return path.join(process.projectDir, 'sasjsbuild', 'tests')
-}
-
 const getFileName = (filePath: string) => path.parse(filePath).base
 
 export async function compileTestFile(
@@ -55,8 +51,15 @@ export async function compileTestFile(
 
   dependencies = `${testVar ? testVar + '\n' : ''}\n${dependencies}`
 
+  const { buildDestinationFolder, buildDestinationTestFolder } =
+    process.sasjsConstants
+
+  const buildDestinationFolderName = buildDestinationFolder
+    .split(path.sep)
+    .pop()
+
   const destinationPath = path.join(
-    testsBuildFolder(),
+    buildDestinationTestFolder,
     saveToRoot
       ? filePath.split(path.sep).pop() || ''
       : filePath
@@ -65,7 +68,7 @@ export async function compileTestFile(
             (acc: any, item: any, i: any, arr: any) =>
               acc.length
                 ? [...acc, item]
-                : arr[i - 1] === 'sasjsbuild'
+                : arr[i - 1] === buildDestinationFolderName
                 ? [...acc, item]
                 : acc,
             []
@@ -78,40 +81,18 @@ export async function compileTestFile(
   if (removeOriginalFile) await deleteFile(filePath)
 }
 
-export async function moveTestFile(filePath: string) {
-  const fileName = filePath.split(path.sep).pop() as string
-
-  if (!isTestFile(fileName)) return
-
-  const destinationPath = filePath.replace('sasjsbuild', 'sasjsbuild/tests')
-
-  const testDestinationFolder = destinationPath
-    .split(path.sep)
-    .slice(0, -1)
-    .join(path.sep)
-
-  if (!(await folderExists(testDestinationFolder))) {
-    await createFolder(testDestinationFolder)
-  }
-
-  await moveFile(filePath, destinationPath)
-
-  const sourceFolder = filePath
-    .split(path.sep)
-    .slice(0, filePath.split(path.sep).length - 1)
-    .join(path.sep)
-
-  if ((await listFilesInFolder(sourceFolder)).length === 0) {
-    await deleteFolder(sourceFolder)
-  }
-}
-
 export async function copyTestMacroFiles(folderAbsolutePath: string) {
   const macroFiles = await listFilesAndSubFoldersInFolder(folderAbsolutePath)
   const macroTestFiles = macroFiles.filter((item) => testFileRegExp.test(item))
 
+  const { buildDestinationTestFolder } = process.sasjsConstants
+
   await asyncForEach(macroTestFiles, async (file) => {
-    const destinationFile = path.join(testsBuildFolder(), 'macros', file)
+    const destinationFile = path.join(
+      buildDestinationTestFolder,
+      'macros',
+      file
+    )
 
     if (!(await fileExists(destinationFile))) {
       await copy(path.join(folderAbsolutePath, file), destinationFile)

diff --git a/src/commands/compile/internal/spec/compileTestFile.spec.ts b/src/commands/compile/internal/spec/compileTestFile.spec.ts
@@ -1,12 +1,11 @@
-import { moveTestFile, compileTestFlow } from '../compileTestFile'
+import { compileTestFlow } from '../compileTestFile'
 import {
   Logger,
   LogLevel,
   Target,
   copy,
   readFile,
   fileExists,
-  createFile,
   generateTimestamp,
   deleteFolder,
   ServerType,
@@ -122,43 +121,6 @@ describe('compileTestFile', () => {
     })
   })
 
-  describe('moveTestFile', () => {
-    it('should move service test', async () => {
-      const relativePath = path.join(
-        'services',
-        'services',
-        'admin',
-        testFileName
-      )
-      const buildPath = path.join(__dirname, appName, 'sasjsbuild')
-      const originalFilePath = path.join(buildPath, relativePath)
-      const destinationFilePath = path.join(buildPath, 'tests', relativePath)
-
-      await createFile(originalFilePath, testBody)
-
-      await moveTestFile(originalFilePath)
-
-      await expect(fileExists(originalFilePath)).resolves.toEqual(false)
-      await expect(fileExists(destinationFilePath)).resolves.toEqual(true)
-      await expect(readFile(destinationFilePath)).resolves.toEqual(testBody)
-    })
-
-    it('should move job test', async () => {
-      const relativePath = path.join('jobs', 'jobs', testFileName)
-      const buildPath = path.join(__dirname, appName, 'sasjsbuild')
-      const originalFilePath = path.join(buildPath, relativePath)
-      const destinationFilePath = path.join(buildPath, 'tests', relativePath)
-
-      await createFile(originalFilePath, testBody)
-
-      await moveTestFile(originalFilePath)
-
-      await expect(fileExists(originalFilePath)).resolves.toEqual(false)
-      await expect(fileExists(destinationFilePath)).resolves.toEqual(true)
-      await expect(readFile(destinationFilePath)).resolves.toEqual(testBody)
-    })
-  })
-
   describe('compileTestFlow', () => {
     it('should compile test flow', async () => {
       const testSetUp = path.join('tests', 'testsetup.sas')

diff --git a/src/commands/deploy/internal/executeNonSasScript.ts b/src/commands/deploy/internal/executeNonSasScript.ts
@@ -8,9 +8,10 @@ import { isShellScript, isPowerShellScript } from '../../../utils/file'
 export async function executeNonSasScript(scriptPath: string) {
   const fileExtension = path.extname(scriptPath)
 
+  const { buildDestinationResultsLogsFolder } = process.sasjsConstants
+
   const logPath = path.join(
-    process.projectDir,
-    'sasjsbuild',
+    buildDestinationResultsLogsFolder,
     path.basename(scriptPath).replace(fileExtension, '.log')
   )
 

diff --git a/src/commands/deploy/spec/deploy.spec.ts b/src/commands/deploy/spec/deploy.spec.ts
@@ -178,7 +178,7 @@ describe('deploy', () => {
 
         expect(process.logger.success).toHaveBeenCalledWith(
           `Shell script execution completed! Log is here: ${path.join(
-            process.sasjsConstants.buildDestinationFolder,
+            process.sasjsConstants.buildDestinationResultsLogsFolder,
             'script.log'
           )}`
         )
@@ -207,7 +207,7 @@ describe('deploy', () => {
 
         expect(process.logger.success).toHaveBeenCalledWith(
           `Shell script execution completed! Log is here: ${path.join(
-            process.sasjsConstants.buildDestinationFolder,
+            process.sasjsConstants.buildDestinationResultsLogsFolder,
             'script.log'
           )}`
         )
@@ -236,7 +236,7 @@ describe('deploy', () => {
 
         expect(process.logger.success).toHaveBeenCalledWith(
           `PowerShell script execution completed! Log is here: ${path.join(
-            process.sasjsConstants.buildDestinationFolder,
+            process.sasjsConstants.buildDestinationResultsLogsFolder,
             'script.log'
           )}`
         )

diff --git a/src/commands/fs/spec/fsCommand.spec.ts b/src/commands/fs/spec/fsCommand.spec.ts
@@ -36,6 +36,12 @@ describe('FSCommand', () => {
         .spyOn(FileModule, 'createFile')
         .mockImplementation(() => Promise.resolve())
 
+      jest
+        .spyOn(configUtils, 'findTargetInConfiguration')
+        .mockImplementation(() =>
+          Promise.resolve({ target: target, isLocal: true })
+        )
+
       const returnCode = await executeCommandWrapper([
         'compile',
         'localFolder',
@@ -50,6 +56,12 @@ describe('FSCommand', () => {
         .spyOn(FileModule, 'createFile')
         .mockImplementation(() => Promise.reject())
 
+      jest
+        .spyOn(configUtils, 'findTargetInConfiguration')
+        .mockImplementation(() =>
+          Promise.resolve({ target: target, isLocal: true })
+        )
+
       const returnCode = await executeCommandWrapper(['compile', 'localFolder'])
       expect(returnCode).toEqual(ReturnCode.InternalError)
       expect(process.logger.error).toHaveBeenCalledWith(

diff --git a/src/utils/file.js b/src/utils/file.js