From 04032831c3e1e90c876efca08130d72f8b671723 Mon Sep 17 00:00:00 2001 From: Mihajlo Date: Thu, 22 Jul 2021 13:43:50 +0200 Subject: [PATCH 1/5] fix: debug on test & make error and parse log test --- src/job-execution/WebJobExecutor.ts | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/job-execution/WebJobExecutor.ts b/src/job-execution/WebJobExecutor.ts index 30a6e2f..a9070dd 100644 --- a/src/job-execution/WebJobExecutor.ts +++ b/src/job-execution/WebJobExecutor.ts @@ -101,20 +101,9 @@ export class WebJobExecutor extends BaseJobExecutor { this.appendRequest(res, sasJob, config.debug) resolve(jsonResponse) } - if (this.serverType === ServerType.Sas9 && config.debug) { - const jsonResponse = parseWeboutResponse(res.result as string) - if (jsonResponse === '') { - throw new Error( - 'Valid JSON could not be extracted from response.' - ) - } - - isValidJson(jsonResponse) - this.appendRequest(res, sasJob, config.debug) - resolve(res.result) - } - isValidJson(res.result as string) + this.appendRequest(res, sasJob, config.debug) + isValidJson(res.result as string) resolve(res.result) }) .catch(async (e: Error) => { From 317c8c81a02089aead0188d46ad9334daea7aaa2 Mon Sep 17 00:00:00 2001 From: Mihajlo Date: Thu, 22 Jul 2021 13:48:11 +0200 Subject: [PATCH 2/5] chore: JES test disable on SAS9 --- sasjs-tests/src/testSuites/Basic.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sasjs-tests/src/testSuites/Basic.ts b/sasjs-tests/src/testSuites/Basic.ts index 2498ba6..0374500 100644 --- a/sasjs-tests/src/testSuites/Basic.ts +++ b/sasjs-tests/src/testSuites/Basic.ts @@ -151,6 +151,9 @@ export const basicTests = ( description: 'Should complete successful request with extra attributes present in response', test: async () => { + if (adapter.getSasjsConfig().serverType !== 'SASVIYA') + return Promise.resolve('skip') + const config = { useComputeApi: false } @@ -165,9 +168,10 @@ export const basicTests = ( ) }, assertion: (response: any) => { + if (response === 'skip') return true + const responseKeys: any = Object.keys(response) return responseKeys.includes('file') && responseKeys.includes('data') } - } ] }) From 97a530cc66736305033026e5450e90fe16b52b28 Mon Sep 17 00:00:00 2001 From: Mihajlo Date: Thu, 22 Jul 2021 14:44:13 +0200 Subject: [PATCH 3/5] style: lint --- sasjs-tests/src/testSuites/Basic.ts | 1 + src/job-execution/WebJobExecutor.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sasjs-tests/src/testSuites/Basic.ts b/sasjs-tests/src/testSuites/Basic.ts index 0374500..87ebbfc 100644 --- a/sasjs-tests/src/testSuites/Basic.ts +++ b/sasjs-tests/src/testSuites/Basic.ts @@ -173,5 +173,6 @@ export const basicTests = ( const responseKeys: any = Object.keys(response) return responseKeys.includes('file') && responseKeys.includes('data') } + } ] }) diff --git a/src/job-execution/WebJobExecutor.ts b/src/job-execution/WebJobExecutor.ts index a9070dd..8e4586e 100644 --- a/src/job-execution/WebJobExecutor.ts +++ b/src/job-execution/WebJobExecutor.ts @@ -101,7 +101,7 @@ export class WebJobExecutor extends BaseJobExecutor { this.appendRequest(res, sasJob, config.debug) resolve(jsonResponse) } - + this.appendRequest(res, sasJob, config.debug) isValidJson(res.result as string) resolve(res.result) From ca7ee83f7f07170fc322be0b4d24e244428fdec1 Mon Sep 17 00:00:00 2001 From: Mihajlo Date: Sat, 24 Jul 2021 18:06:15 +0200 Subject: [PATCH 4/5] chore: fixing multiple login attempts by adding pause between calling functions --- sasjs-tests/src/testSuites/Basic.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sasjs-tests/src/testSuites/Basic.ts b/sasjs-tests/src/testSuites/Basic.ts index 87ebbfc..c514dcc 100644 --- a/sasjs-tests/src/testSuites/Basic.ts +++ b/sasjs-tests/src/testSuites/Basic.ts @@ -47,7 +47,9 @@ export const basicTests = ( 'Should fail on first attempt and should log the user in on second attempt', test: async () => { await adapter.logOut() + await sleep(1000) await adapter.logIn('invalid', 'invalid') + await sleep(1000) return adapter.logIn(userName, password) }, assertion: (response: any) => @@ -176,3 +178,7 @@ export const basicTests = ( } ] }) + +const sleep = (ms: number) => { + return new Promise(resolve => setTimeout(resolve, ms)); +} \ No newline at end of file From a615c5fdb6c4c04bb87c185d03eb21ed22f5d743 Mon Sep 17 00:00:00 2001 From: Mihajlo Date: Sat, 24 Jul 2021 18:07:17 +0200 Subject: [PATCH 5/5] style: lint --- sasjs-tests/src/testSuites/Basic.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sasjs-tests/src/testSuites/Basic.ts b/sasjs-tests/src/testSuites/Basic.ts index c514dcc..62afa2d 100644 --- a/sasjs-tests/src/testSuites/Basic.ts +++ b/sasjs-tests/src/testSuites/Basic.ts @@ -180,5 +180,5 @@ export const basicTests = ( }) const sleep = (ms: number) => { - return new Promise(resolve => setTimeout(resolve, ms)); -} \ No newline at end of file + return new Promise((resolve) => setTimeout(resolve, ms)) +}