Merge pull request #751 from sasjs/quick-fix

fix: should not assign error to parsedSasjsServeLog

.github/workflows/build.yml

@@ -24,16 +24,16 @@ jobs:
 
       - name: Check npm audit
         run: npm audit --production --audit-level=low
-      
+
       - name: Install Dependencies
         run: npm ci
-      
+
       - name: Check code style
         run: npm run lint
-      
+
       - name: Run unit tests
         run: npm test
-      
+
       - name: Build Package
         run: npm run package:lib
         env:
@@ -41,7 +41,7 @@ jobs:
 
       - name: Install SSH Key
         uses: shimataro/ssh-key-action@v2
-        with: 
+        with:
           key: ${{ secrets.DCGITLAB_KEY }}
           known_hosts: 'placeholder'
 
@@ -88,7 +88,7 @@ jobs:
           replace-in-files --regex='"sasjsTestsUrl".*' --replacement='"sasjsTestsUrl":"${{ secrets.SASJS_TEST_URL_VIYA }}",' ./cypress.json
           replace-in-files --regex='"username".*' --replacement='"username":"${{ secrets.SASJS_USERNAME }}",' ./cypress.json
           replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./cypress.json
-          sh ./sasjs-cypress-run.sh ${{ secrets.DISCORD_WEBHOOK }} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
+          sh ./sasjs-tests/sasjs-cypress-run.sh ${{ secrets.MATRIX_TOKEN }} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
 
       # For some reason if coverage report action is run before other commands, those commands can't access the directories and files on which they depend on
       - name: Generate coverage report

sasjs-cypress-run.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if npm run cy:run -- --spec "cypress/integration/sasjs.tests.ts" ; then
-    echo "Cypress sasjs testing passed!"
-else
-    curl -X POST --header "Content-Type:application/json" --data '{"username":"GitHub CI - Adapter SASJS-TESTS (FAIL)", "content":"Automated sasjs-tests failed on the @sasjs/adapter PR on following link.\n'$2'", "avatar_url":"https://i.ibb.co/Lpk7Xvq/error-outline.png"}' $1
-
-    echo "Cypress sasjs testing failed!"
-    exit 1
-fi

sasjs-tests/sasjs-cypress-run.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if npm run cy:run -- --spec "cypress/integration/sasjs.tests.ts" ; then
+    echo "Cypress sasjs testing passed!"
+else
+    echo '{"msgtype":"m.text", "body":"Automated sasjs-tests failed on the @sasjs/adapter PR: '$2'"}'
+    curl -XPOST -d '{"msgtype":"m.text", "body":"Automated sasjs-tests failed on the @sasjs/adapter PR: '$2'"}' https://matrix.4gl.io/_matrix/client/r0/rooms/%21BDUPBPEGVvRLKLQUxY:4gl.io/send/m.room.message?access_token=$1
+    echo "Cypress sasjs testing failed!"
+    exit 1
+fi

src/SASjsApiClient.ts

@@ -88,9 +88,6 @@ export class SASjsApiClient {
       .then((res: any) => {
         if (res.log) parsedSasjsServerLog = res.log
       })
-      .catch((err) => {
-        parsedSasjsServerLog = err
-      })
 
     return parsedSasjsServerLog
   }

src/request/SasjsRequestClient.ts

@@ -26,7 +26,7 @@ export class SasjsRequestClient extends RequestClient {
 
   protected parseResponse<T>(response: AxiosResponse<any>) {
     const etag = response?.headers ? response.headers['etag'] : ''
-    let parsedResponse
+    let parsedResponse = {}
     let log
 
     try {
@@ -37,10 +37,10 @@ export class SasjsRequestClient extends RequestClient {
       }
     } catch {
       if (response.data.includes(SASJS_LOGS_SEPARATOR)) {
-        parsedResponse = getValidJson(
+        const splittedResponse = response.data.split(SASJS_LOGS_SEPARATOR)
-          response.data.split(SASJS_LOGS_SEPARATOR)[0]
+        log = splittedResponse[1]
-        )
+        if (splittedResponse[0].trim())
-        log = response.data.split(SASJS_LOGS_SEPARATOR)[1]
+          parsedResponse = getValidJson(splittedResponse[0])
       } else parsedResponse = response.data
     }