From c32258eb3c64c118526c4f0abbcc7dd6f59ffe72 Mon Sep 17 00:00:00 2001 From: sabhas Date: Mon, 14 Jun 2021 23:18:26 +0500 Subject: [PATCH 1/3] fix: code modified in appendRequest method fixes #327 --- src/job-execution/JobExecutor.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/job-execution/JobExecutor.ts b/src/job-execution/JobExecutor.ts index 48b2dd9..2517a57 100644 --- a/src/job-execution/JobExecutor.ts +++ b/src/job-execution/JobExecutor.ts @@ -62,14 +62,14 @@ export abstract class BaseJobExecutor implements JobExecutor { let sasWork = null if (debug) { - if (response?.result && response?.log) { + if (response?.log) { sourceCode = parseSourceCode(response.log) generatedCode = parseGeneratedCode(response.log) - if (response.log) { - sasWork = response.log - } else { + if (response?.result) { sasWork = response.result.WORK + } else { + sasWork = response.log } } else if (response?.result) { sourceCode = parseSourceCode(response.result) From 51ac6b052bfa46d6e8663760227a3f52677c21eb Mon Sep 17 00:00:00 2001 From: sabhas Date: Mon, 14 Jun 2021 23:21:17 +0500 Subject: [PATCH 2/3] fix: test case which check extra attributes on JES approach fixed --- sasjs-tests/src/testSuites/Basic.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sasjs-tests/src/testSuites/Basic.ts b/sasjs-tests/src/testSuites/Basic.ts index 457f1a2..c9f6205 100644 --- a/sasjs-tests/src/testSuites/Basic.ts +++ b/sasjs-tests/src/testSuites/Basic.ts @@ -161,16 +161,12 @@ export const basicTests = ( config, undefined, undefined, - ['output', 'file', 'data'] + ['file', 'data'] ) }, assertion: (response: any) => { const responseKeys: any = Object.keys(response) - return ( - responseKeys.includes('file') && - responseKeys.includes('output') && - responseKeys.includes('data') - ) + return responseKeys.includes('file') && responseKeys.includes('output') } } ] From 630f2e9c37c4c6cde1f3fbc09a3cb66bc4a6af50 Mon Sep 17 00:00:00 2001 From: sabhas Date: Tue, 15 Jun 2021 11:29:21 +0500 Subject: [PATCH 3/3] fix: test regarding Request with extra attributes on JES approach fixed --- sasjs-tests/src/testSuites/Basic.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sasjs-tests/src/testSuites/Basic.ts b/sasjs-tests/src/testSuites/Basic.ts index c9f6205..2498ba6 100644 --- a/sasjs-tests/src/testSuites/Basic.ts +++ b/sasjs-tests/src/testSuites/Basic.ts @@ -166,7 +166,7 @@ export const basicTests = ( }, assertion: (response: any) => { const responseKeys: any = Object.keys(response) - return responseKeys.includes('file') && responseKeys.includes('output') + return responseKeys.includes('file') && responseKeys.includes('data') } } ]