chore(git): Merge branch 'master' into auto-tests

sasjs-tests/README.md

@@ -47,7 +47,7 @@ npm i -g copyfiles
 ```
 and then run to build:
 ```bash
-npm run update:adapter && npm run build 
+npm run update:adapter && npm run build
 ```
 when it finishes run to deploy:
 ```bash
@@ -70,7 +70,7 @@ parmcards4;
   %webout(FETCH)
   %webout(OPEN)
   %macro x();
-  %do i=1 %to &_webin_file_count; %webout(OBJ,&&_webin_name&i) %end;
+  %do i=1 %to &_webin_file_count; %webout(OBJ,&&_webin_name&i,missing=STRING,showmeta=YES) %end;
   %mend; %x()
   %webout(CLOSE)
 ;;;;
@@ -79,11 +79,20 @@ parmcards4;
   %webout(FETCH)
   %webout(OPEN)
   %macro x();
-  %do i=1 %to &_webin_file_count; %webout(ARR,&&_webin_name&i) %end;
+  %do i=1 %to &_webin_file_count; %webout(ARR,&&_webin_name&i,missing=STRING,showmeta=YES) %end;
   %mend; %x()
   %webout(CLOSE)
 ;;;;
 %mm_createwebservice(path=/Public/app/common,name=sendArr)
+parmcards4;
+  data work.macvars;
+    set sashelp.vmacro;
+  run;
+  %webout(OPEN)
+  %webout(OBJ,macvars) 
+  %webout(CLOSE)
+;;;;
+%mm_createwebservice(path=/Public/app/common,name=sendMacVars)
 parmcards4;
 let he who hath understanding, reckon the number of the beast
 ;;;;
@@ -111,28 +120,35 @@ parmcards4;
   %macro x();
   %do i=1 %to %sysfunc(countw(&sasjs_tables));
     %let table=%scan(&sasjs_tables,&i);
-    %webout(OBJ,&table)
+    %webout(OBJ,&table,missing=STRING,showmeta=YES)
   %end;
   %mend;
   %x()
   %webout(CLOSE)
 ;;;;
 %mp_createwebservice(path=/Public/app/common,name=sendObj)
-filename ft15f001 temp;
 parmcards4;
   %webout(FETCH)
   %webout(OPEN)
   %macro x();
   %do i=1 %to %sysfunc(countw(&sasjs_tables));
     %let table=%scan(&sasjs_tables,&i);
-    %webout(ARR,&table)
+    %webout(ARR,&table,missing=STRING,showmeta=YES)
   %end;
   %mend;
   %x()
   %webout(CLOSE)
 ;;;;
 %mp_createwebservice(path=/Public/app/common,name=sendArr)
-filename ft15f001 temp;
+parmcards4;
+  data work.macvars;
+    set sashelp.vmacro;
+  run;
+  %webout(OPEN)
+  %webout(OBJ,macvars) 
+  %webout(CLOSE)
+;;;;
+%mp_createwebservice(path=/Public/app/common,name=sendMacVars)
 parmcards4;
 If you can keep your head when all about you
     Are losing theirs and blaming it on you,

sasjs-tests/package.json

@@ -5,7 +5,7 @@
   "private": true,
   "dependencies": {
     "@sasjs/adapter": "file:../build/sasjs-adapter-5.0.0.tgz",
-    "@sasjs/test-framework": "^1.4.0",
+    "@sasjs/test-framework": "^1.4.3",
     "@types/jest": "^26.0.20",
     "@types/node": "^14.14.41",
     "@types/react": "^17.0.1",
@@ -22,7 +22,7 @@
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
-    "update:adapter": "cd .. && npm run package:lib && cd sasjs-tests && npm i ../build/sasjs-adapter-5.0.0.tgz",
+    "update:adapter": "cd .. && npm run package:lib && cd sasjs-tests && npm i ../build/sasjs-adapter-5.0.0.tgz --legacy-peer-deps",
     "deploy:tests": "rsync -avhe ssh ./build/* --delete $SSH_ACCOUNT:$DEPLOY_PATH || npm run deploy:tests-win",
     "deploy:tests-win": "scp %DEPLOY_PATH% ./build/*",
     "deploy": "npm run update:adapter && npm run build && npm run deploy:tests"
@@ -43,6 +43,6 @@
     ]
   },
   "devDependencies": {
-    "node-sass": "^5.0.0"
+    "node-sass": "^6.0.1"
   }
 }

sasjs-tests/src/App.tsx

@@ -6,6 +6,7 @@ import { specialCaseTests } from './testSuites/SpecialCases'
 import { sasjsRequestTests } from './testSuites/SasjsRequests'
 import '@sasjs/test-framework/dist/index.css'
 import { computeTests } from './testSuites/Compute'
+import { fileUploadTests } from './testSuites/FileUpload'
 
 const App = (): ReactElement<{}> => {
   const { adapter, config } = useContext(AppContext)
@@ -18,7 +19,8 @@ const App = (): ReactElement<{}> => {
         sendArrTests(adapter),
         sendObjTests(adapter),
         specialCaseTests(adapter),
-        sasjsRequestTests(adapter)
+        sasjsRequestTests(adapter),
+        fileUploadTests(adapter)
       ]
 
       if (adapter.getSasjsConfig().serverType === 'SASVIYA') {

sasjs-tests/src/testSuites/Basic.ts

@@ -1,4 +1,4 @@
-import SASjs, { SASjsConfig } from '@sasjs/adapter'
+import SASjs, { LoginMechanism, SASjsConfig } from '@sasjs/adapter'
 import { TestSuite } from '@sasjs/test-framework'
 import { ServerType } from '@sasjs/utils/types'
 
@@ -6,6 +6,7 @@ const stringData: any = { table1: [{ col1: 'first col value' }] }
 
 const defaultConfig: SASjsConfig = {
   serverUrl: window.location.origin,
+  pathSASJS: '/SASjsApi/stp/execute',
   pathSAS9: '/SASStoredProcess/do',
   pathSASViya: '/SASJobExecution',
   appLoc: '/Public/seedapp',
@@ -13,7 +14,7 @@ const defaultConfig: SASjsConfig = {
   debug: false,
   contextName: 'SAS Job Execution compute context',
   useComputeApi: false,
-  allowInsecureRequests: false
+  loginMechanism: LoginMechanism.Default
 }
 
 const customConfig = {
@@ -41,6 +42,19 @@ export const basicTests = (
       assertion: (response: any) =>
         response && response.isLoggedIn && response.userName === userName
     },
+    {
+      title: 'Fetch username for already logged in user',
+      description: 'Should log the user in',
+      test: async () => {
+        await adapter.logIn(userName, password)
+
+        const newAdapterIns = new SASjs(adapter.getSasjsConfig())
+
+        return await newAdapterIns.checkSession()
+      },
+      assertion: (response: any) =>
+        response?.isLoggedIn && response?.userName === userName
+    },
     {
       title: 'Multiple Log in attempts',
       description:
@@ -48,7 +62,7 @@ export const basicTests = (
       test: async () => {
         await adapter.logOut()
         await adapter.logIn('invalid', 'invalid')
-        return adapter.logIn(userName, password)
+        return await adapter.logIn(userName, password)
       },
       assertion: (response: any) =>
         response && response.isLoggedIn && response.userName === userName
@@ -64,8 +78,8 @@ export const basicTests = (
           'common/sendArr',
           stringData,
           undefined,
-          () => {
-            adapter.logIn(userName, password)
+          async () => {
+            await adapter.logIn(userName, password)
           }
         )
       },
@@ -150,8 +164,8 @@ export const basicTests = (
       title: 'Web request',
       description: 'Should run the request with old web approach',
       test: async () => {
-        const config = {
-          useComputeApi: undefined
+        const config: Partial<SASjsConfig> = {
+          useComputeApi: false
         }
 
         return await adapter.request('common/sendArr', stringData, config)

sasjs-tests/src/testSuites/FileUpload.ts

@@ -0,0 +1,35 @@
+import SASjs from '@sasjs/adapter'
+import { TestSuite } from '@sasjs/test-framework'
+
+export const fileUploadTests = (adapter: SASjs): TestSuite => ({
+  name: 'File Upload Tests',
+  tests: [
+    {
+      title: 'Upload File',
+      description: 'Should upload the file to VIYA',
+      test: async () => {
+        let blob: any = new Blob(['test'], { type: 'text/html' })
+        blob['lastModifiedDate'] = ''
+        blob['name'] = 'macvars_testfile'
+        let file = blob
+
+        const filesToUpload = [
+          {
+            file: file,
+            fileName: file.name
+          }
+        ]
+
+        return adapter.uploadFile('common/sendMacVars', filesToUpload, null)
+      },
+      assertion: (response: any) =>
+        (response.macvars as any[]).findIndex(
+          (el: any) => el.NAME === '_WEBIN_FILE_COUNT' && el.VALUE === '1'
+        ) > -1 &&
+        (response.macvars as any[]).findIndex(
+          (el: any) =>
+            el.NAME === '_WEBIN_FILENAME' && el.VALUE === 'macvars_testfile'
+        ) > -1
+    }
+  ]
+})

sasjs-tests/src/testSuites/RequestData.ts

@@ -218,6 +218,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
         const invalidData: any = {
           xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx: [{ col1: 42 }]
         }
+
         return adapter.request('common/sendObj', invalidData).catch((e) => e)
       },
       assertion: (error: any) =>

sasjs-tests/src/testSuites/SpecialCases.ts

@@ -81,6 +81,27 @@ const errorAndCsrfData: any = {
   _csrf: [{ col1: 'q', col2: 'w', col3: 'e', col4: 'r' }]
 }
 
+const testTable = 'sometable'
+export const testTableWithSpecialNumeric: { [key: string]: any } = {
+  [testTable]: [
+    { var1: 'string', var2: 232, specialnumeric: 'A' },
+    { var1: 'string', var2: 232, specialnumeric: 'B' },
+    { var1: 'string', var2: 232, specialnumeric: '_' },
+    { var1: 'string', var2: 232, specialnumeric: 0 },
+    { var1: 'string', var2: 232, specialnumeric: 'Z' },
+    { var1: 'string', var2: 232, specialnumeric: null }
+  ],
+  [`$${testTable}`]: { formats: { var1: '$char12.', specialnumeric: 'best.' } }
+}
+export const testTableWithSpecialNumericOneRow: { [key: string]: any } = {
+  [testTable]: [{ var1: 'string', var2: 232, specialnumeric: 'S' }],
+  [`$${testTable}`]: { formats: { var1: '$char12.', specialnumeric: 'best.' } }
+}
+export const testTableWithSpecialNumericLowercase: { [key: string]: any } = {
+  [testTable]: [{ var1: 'string', var2: 232, specialnumeric: 's' }],
+  [`$${testTable}`]: { formats: { var1: '$char12.', specialnumeric: 'best.' } }
+}
+
 export const specialCaseTests = (adapter: SASjs): TestSuite => ({
   name: 'Special Cases',
   tests: [
@@ -277,6 +298,203 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
         const responseKeys: any = Object.keys(response)
         return responseKeys.includes('file') && responseKeys.includes('data')
       }
+    },
+    {
+      title: 'Special missing values',
+      description: 'Should support special missing values',
+      test: () => {
+        return adapter.request('common/sendObj', testTableWithSpecialNumeric)
+      },
+      assertion: (res: any) => {
+        let assertionRes = true
+
+        // We receive formats in response. We compare it with formats that we included in request to make sure they are equal
+        const resVars = res[`$${testTable}`].vars
+
+        Object.keys(resVars).forEach((key: any, i: number) => {
+          let formatValue =
+            testTableWithSpecialNumeric[`$${testTable}`].formats[
+              key.toLowerCase()
+            ]
+          // If it is char, we change it to $ to be compatible for comparsion
+          // If it is number, it will already be compatible to comapre (best.)
+          formatValue = formatValue?.includes('$') ? '$' : formatValue
+
+          if (
+            formatValue !== undefined &&
+            !resVars[key].format.includes(formatValue)
+          ) {
+            assertionRes = false
+          }
+        })
+
+        // Here we will compare the response values with values we send
+        const resValues = res[testTable]
+
+        testTableWithSpecialNumeric[testTable].forEach(
+          (row: { [key: string]: any }, i: number) =>
+            Object.keys(row).forEach((col: string) => {
+              if (resValues[i][col.toUpperCase()] !== row[col]) {
+                assertionRes = false
+              }
+            })
+        )
+
+        return assertionRes
+      }
+    },
+    {
+      title: 'Special missing values (ONE ROW)',
+      description:
+        'Should support special missing values, when one row is send',
+      test: () => {
+        return adapter.request(
+          'common/sendObj',
+          testTableWithSpecialNumericOneRow
+        )
+      },
+      assertion: (res: any) => {
+        let assertionRes = true
+
+        // We receive formats in response. We compare it with formats that we included in request to make sure they are equal
+        const resVars = res[`$${testTable}`].vars
+
+        Object.keys(resVars).forEach((key: any, i: number) => {
+          let formatValue =
+            testTableWithSpecialNumeric[`$${testTable}`].formats[
+              key.toLowerCase()
+            ]
+          // If it is char, we change it to $ to be compatible for comparsion
+          // If it is number, it will already be compatible to comapre (best.)
+          formatValue = formatValue?.includes('$') ? '$' : formatValue
+
+          if (
+            formatValue !== undefined &&
+            !resVars[key].format.includes(formatValue)
+          ) {
+            assertionRes = false
+          }
+        })
+
+        // Here we will compare the response values with values we send
+        const resValues = res[testTable]
+
+        testTableWithSpecialNumericOneRow[testTable].forEach(
+          (row: { [key: string]: any }, i: number) =>
+            Object.keys(row).forEach((col: string) => {
+              if (resValues[i][col.toUpperCase()] !== row[col]) {
+                assertionRes = false
+              }
+            })
+        )
+
+        return assertionRes
+      }
+    },
+    {
+      title: 'Special missing values (LOWERCASE)',
+      description:
+        'Should support special missing values, when LOWERCASE value is sent',
+      test: () => {
+        return adapter.request(
+          'common/sendObj',
+          testTableWithSpecialNumericLowercase
+        )
+      },
+      assertion: (res: any) => {
+        let assertionRes = true
+
+        // We receive formats in response. We compare it with formats that we included in request to make sure they are equal
+        const resVars = res[`$${testTable}`].vars
+
+        Object.keys(resVars).forEach((key: any, i: number) => {
+          let formatValue =
+            testTableWithSpecialNumericLowercase[`$${testTable}`].formats[
+              key.toLowerCase()
+            ]
+          // If it is a char, we change it to $ to be compatible for comparison
+          // If it is a number, it will already be compatible to compare (best.)
+          formatValue = formatValue?.includes('$') ? '$' : formatValue
+
+          if (
+            formatValue !== undefined &&
+            !resVars[key].format.includes(formatValue)
+          ) {
+            assertionRes = false
+          }
+        })
+
+        // Here we will compare the response values with values we send
+        const resValues = res[testTable]
+
+        testTableWithSpecialNumericLowercase[testTable].forEach(
+          (row: { [key: string]: any }, i: number) =>
+            Object.keys(row).forEach((col: string) => {
+              if (col === 'specialnumeric') {
+                if (
+                  resValues[i][col.toUpperCase()] !== row[col].toUpperCase()
+                ) {
+                  assertionRes = false
+                }
+              } else {
+                if (resValues[i][col.toUpperCase()] !== row[col]) {
+                  assertionRes = false
+                }
+              }
+            })
+        )
+
+        return assertionRes
+      }
+    },
+    {
+      title: 'Special missing values (ONE ROW) useComputeApi undefined',
+      description:
+        'Should support special missing values, when one row is send (On VIYA Web Approach)',
+      test: () => {
+        return adapter.request(
+          'common/sendObj',
+          testTableWithSpecialNumericOneRow,
+          { useComputeApi: undefined }
+        )
+      },
+      assertion: (res: any) => {
+        let assertionRes = true
+
+        // We receive formats in response. We compare it with formats that we included in request to make sure they are equal
+        const resVars = res[`$${testTable}`].vars
+
+        Object.keys(resVars).forEach((key: any, i: number) => {
+          let formatValue =
+            testTableWithSpecialNumeric[`$${testTable}`].formats[
+              key.toLowerCase()
+            ]
+          // If it is char, we change it to $ to be compatible for comparsion
+          // If it is number, it will already be compatible to comapre (best.)
+          formatValue = formatValue?.includes('$') ? '$' : formatValue
+
+          if (
+            formatValue !== undefined &&
+            !resVars[key].format.includes(formatValue)
+          ) {
+            assertionRes = false
+          }
+        })
+
+        // Here we will compare the response values with values we send
+        const resValues = res[testTable]
+
+        testTableWithSpecialNumericOneRow[testTable].forEach(
+          (row: { [key: string]: any }, i: number) =>
+            Object.keys(row).forEach((col: string) => {
+              if (resValues[i][col.toUpperCase()] !== row[col]) {
+                assertionRes = false
+              }
+            })
+        )
+
+        return assertionRes
+      }
     }
   ]
 })