From 60a1f84604fc25a2b9f0a7ded6b904a5121a4b35 Mon Sep 17 00:00:00 2001
From: Krishna Acondy <kc.acondy@outlook.com>
Date: Tue, 2 Feb 2021 08:42:01 +0000
Subject: [PATCH] chore(*): clean up, address review comments

---
 sasjs-tests/src/testSuites/SasjsRequests.ts |  6 +++---
 src/job-execution/WebJobExecutor.ts         |  5 +++--
 src/test/FileUploader.spec.ts               | 24 ++++++++++-----------
 src/types/SASjsWaitingRequest.ts            | 14 ------------
 src/types/index.ts                          |  1 -
 5 files changed, 17 insertions(+), 33 deletions(-)
 delete mode 100644 src/types/SASjsWaitingRequest.ts

diff --git a/sasjs-tests/src/testSuites/SasjsRequests.ts b/sasjs-tests/src/testSuites/SasjsRequests.ts
index a7f30ba..2f0b75d 100644
--- a/sasjs-tests/src/testSuites/SasjsRequests.ts
+++ b/sasjs-tests/src/testSuites/SasjsRequests.ts
@@ -28,9 +28,9 @@ export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
       test: async () => {
         return adapter
           .request("common/makeErr", data, { debug: true })
-          .catch((err) => {
-            let sasRequests = adapter.getSasRequests();
-            let makeErrRequest: any =
+          .catch(() => {
+            const sasRequests = adapter.getSasRequests();
+            const makeErrRequest: any =
               sasRequests.find((req) => req.serviceLink.includes("makeErr")) ||
               null;
 
diff --git a/src/job-execution/WebJobExecutor.ts b/src/job-execution/WebJobExecutor.ts
index 940c1ba..c20c29b 100644
--- a/src/job-execution/WebJobExecutor.ts
+++ b/src/job-execution/WebJobExecutor.ts
@@ -106,8 +106,9 @@ export class WebJobExecutor extends BaseJobExecutor {
     let folderPath
     let jobName: string
     if (isRelativePath(sasJob)) {
-      folderPath = sasJob.split('/')[0]
-      jobName = sasJob.split('/')[1]
+      const folderPathParts = sasJob.split('/')
+      folderPath = folderPathParts.length > 1 ? folderPathParts[0] : ''
+      jobName = folderPathParts.length > 1 ? folderPathParts[1] : ''
     } else {
       const folderPathParts = sasJob.split('/')
       jobName = folderPathParts.pop() || ''
diff --git a/src/test/FileUploader.spec.ts b/src/test/FileUploader.spec.ts
index be29506..9e225a2 100644
--- a/src/test/FileUploader.spec.ts
+++ b/src/test/FileUploader.spec.ts
@@ -85,21 +85,19 @@ describe('FileUploader', () => {
     })
   })
 
-  // it('should throw an error when invalid JSON is returned by the server', async (done) => {
-  //   mockedAxios.post.mockImplementation(() =>
-  //     Promise.resolve({ data: '{invalid: "json"' })
-  //   )
+  it('should throw an error when invalid JSON is returned by the server', async (done) => {
+    mockedAxios.post.mockImplementation(() =>
+      Promise.resolve({ data: '{invalid: "json"' })
+    )
 
-  //   const sasJob = 'test'
-  //   const { files, params } = prepareFilesAndParams()
+    const sasJob = 'test'
+    const { files, params } = prepareFilesAndParams()
 
-  //   fileUploader.uploadFile(sasJob, files, params).catch((err: any) => {
-  //     expect(err.error.message).toEqual(
-  //       'Error while parsing json from upload response.'
-  //     )
-  //     done()
-  //   })
-  // })
+    fileUploader.uploadFile(sasJob, files, params).catch((err: any) => {
+      expect(err.error.message).toEqual('File upload request failed.')
+      done()
+    })
+  })
 
   it('should throw an error when the server request fails', async (done) => {
     mockedAxios.post.mockImplementation(() =>
diff --git a/src/types/SASjsWaitingRequest.ts b/src/types/SASjsWaitingRequest.ts
deleted file mode 100644
index 531dbf2..0000000
--- a/src/types/SASjsWaitingRequest.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Represents requests that are queued, pending a signon event.
- *
- */
-export interface SASjsWaitingRequest {
-  requestPromise: {
-    promise: any
-    resolve: any
-    reject: any
-  }
-  SASjob: string
-  data: any
-  config?: any
-}
diff --git a/src/types/index.ts b/src/types/index.ts
index c41565a..2719da1 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -11,7 +11,6 @@ export * from './Link'
 export * from './LoginRequiredError'
 export * from './SASjsConfig'
 export * from './SASjsRequest'
-export * from './SASjsWaitingRequest'
 export * from './Session'
 export * from './UploadFile'
 export * from './PollOptions'