@sasjs/cli 3.26.0 → 3.27.1

package/build/commands/testing/internal/saveOutput.d.ts

@@ -1,9 +1,6 @@
 import { TestResults, TestResultCsv } from '../../../types';
 export declare const saveLog: (outDirectory: string, test: string, log: string, lineBreak?: boolean) => Promise<void>;
-export declare const saveResultJson: (outDirectory: string, result: TestResults) => Promise<string | false>;
-export declare const saveResultCsv: (outDirectory: string, result: TestResults, options?: {}) => Promise<{
-    csvData: TestResultCsv[];
-    csvPath: string;
-}>;
-export declare const saveResultXml: (outDirectory: string, result: TestResults) => Promise<string>;
-export declare const saveCoverageLcov: (outDirectory: string, tests: string[]) => Promise<string>;
+export declare const saveResultJson: (jsonPath: string, result: TestResults) => Promise<void>;
+export declare const saveResultCsv: (csvPath: string, result: TestResults, options?: {}) => Promise<TestResultCsv[]>;
+export declare const saveResultXml: (xmlPath: string, result: TestResults) => Promise<void>;
+export declare const saveCoverageLcov: (coverageReportPath: string, tests: string[]) => Promise<void>;

package/build/commands/testing/internal/saveOutput.js

@@ -91,31 +91,27 @@ var saveLog = function (outDirectory, test, log, lineBreak) {
     });
 };
 exports.saveLog = saveLog;
-var saveResultJson = function (outDirectory, result) { return __awaiter(void 0, void 0, void 0, function () {
-    var finaleResult, filePath;
+var saveResultJson = function (jsonPath, result) { return __awaiter(void 0, void 0, void 0, function () {
+    var finaleResult, err_1;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                try {
-                    finaleResult = JSON.stringify(result, null, 2);
-                }
-                catch (err) {
-                    (0, displayResult_1.displayError)(err, 'Error while converting test results into a string.');
-                    return [2 /*return*/, false];
-                }
-                filePath = path_1.default.join(outDirectory, "".concat(resultFileName, ".json"));
-                if (!finaleResult) return [3 /*break*/, 2];
-                return [4 /*yield*/, (0, utils_1.createFile)(filePath, finaleResult)];
+                _a.trys.push([0, 2, , 3]);
+                finaleResult = JSON.stringify(result, null, 2);
+                return [4 /*yield*/, (0, utils_1.createFile)(jsonPath, finaleResult)];
             case 1:
                 _a.sent();
                 return [3 /*break*/, 3];
-            case 2: return [2 /*return*/, false];
-            case 3: return [2 /*return*/, filePath];
+            case 2:
+                err_1 = _a.sent();
+                (0, displayResult_1.displayError)(err_1, 'Error while converting test results into a string.');
+                throw new Error('Error while converting test results into a string.');
+            case 3: return [2 /*return*/];
         }
     });
 }); };
 exports.saveResultJson = saveResultJson;
-var saveResultCsv = function (outDirectory, result, options) {
+var saveResultCsv = function (csvPath, result, options) {
     if (options === void 0) { options = {
         header: true,
         columns: {
@@ -155,7 +151,6 @@ var saveResultCsv = function (outDirectory, result, options) {
             });
             return [2 /*return*/, new Promise(function (resolve, reject) {
                     return (0, csv_stringify_1.default)(csvData, options || {}, function (err, output) { return __awaiter(void 0, void 0, void 0, function () {
-                        var csvPath;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
@@ -163,13 +158,12 @@ var saveResultCsv = function (outDirectory, result, options) {
                                         (0, displayResult_1.displayError)(err, 'Error while saving CSV file');
                                         reject(err);
                                     }
-                                    csvPath = path_1.default.join(outDirectory, "".concat(resultFileName, ".csv"));
                                     return [4 /*yield*/, (0, utils_1.createFile)(csvPath, output).catch(function (err) {
                                             return (0, displayResult_1.displayError)(err, 'Error while creating CSV file.');
                                         })];
                                 case 1:
                                     _a.sent();
-                                    return [2 /*return*/, resolve({ csvData: csvData, csvPath: csvPath })];
+                                    return [2 /*return*/, resolve(csvData)];
                             }
                         });
                     }); });
@@ -178,12 +172,11 @@ var saveResultCsv = function (outDirectory, result, options) {
     });
 };
 exports.saveResultCsv = saveResultCsv;
-var saveResultXml = function (outDirectory, result) { return __awaiter(void 0, void 0, void 0, function () {
-    var filePath, getFailures, resultXml, xmlString;
+var saveResultXml = function (xmlPath, result) { return __awaiter(void 0, void 0, void 0, function () {
+    var getFailures, resultXml, xmlString;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                filePath = path_1.default.join(outDirectory, "".concat(resultFileName, ".xml"));
                 getFailures = function (testCase) {
                     if (Array.isArray(testCase.result)) {
                         return testCase.result
@@ -258,16 +251,16 @@ var saveResultXml = function (outDirectory, result) { return __awaiter(void 0, v
                     ], false)
                 };
                 xmlString = (0, xml_1.default)(resultXml, { declaration: true, indent: '  ' });
-                return [4 /*yield*/, (0, utils_1.createFile)(filePath, xmlString)];
+                return [4 /*yield*/, (0, utils_1.createFile)(xmlPath, xmlString)];
             case 1:
                 _a.sent();
-                return [2 /*return*/, filePath];
+                return [2 /*return*/];
         }
     });
 }); };
 exports.saveResultXml = saveResultXml;
-var saveCoverageLcov = function (outDirectory, tests) { return __awaiter(void 0, void 0, void 0, function () {
-    var testsPrefixRegExp, coverageReport, coveringFile, filePath;
+var saveCoverageLcov = function (coverageReportPath, tests) { return __awaiter(void 0, void 0, void 0, function () {
+    var testsPrefixRegExp, coverageReport, coveringFile;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -297,11 +290,10 @@ var saveCoverageLcov = function (outDirectory, tests) { return __awaiter(void 0,
                     }); })];
             case 1:
                 _a.sent();
-                filePath = path_1.default.join(outDirectory, 'coverage.lcov');
-                return [4 /*yield*/, (0, utils_1.createFile)(filePath, coverageReport.join('\n'))];
+                return [4 /*yield*/, (0, utils_1.createFile)(coverageReportPath, coverageReport.join('\n'))];
             case 2:
                 _a.sent();
-                return [2 /*return*/, filePath];
+                return [2 /*return*/];
         }
     });
 }); };

package/build/commands/testing/spec/testing.spec.js

@@ -123,11 +123,27 @@ describe('sasjs test', function () {
             });
         }); });
         it('should execute tests and create result CSV, XML and JSON files using default source and output locations', function () { return __awaiter(void 0, void 0, void 0, function () {
-            var expectedResultsJson, expectedResultsCsv, resultsFolderPath, resultsJsonPath, resultsJson, resultsCsvPath, parsedResults, resultsCsv, resultsXmlPath, resultsXml, expectedResultsXml, coverageLcovPath, coverageLcov;
+            var resultsFolderPath, resultsJsonPath, resultsCsvPath, resultsXmlPath, coverageReportPath, expectedResultsJson, expectedResultsCsv, resultsJson, parsedResults, resultsCsv, resultsXml, expectedResultsXml, coverageLcovPath, coverageLcov;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        resultsFolderPath = path_1.default.join(__dirname, target.name, 'sasjsresults');
+                        resultsJsonPath = path_1.default.join(resultsFolderPath, 'testResults.json');
+                        resultsCsvPath = path_1.default.join(resultsFolderPath, 'testResults.csv');
+                        resultsXmlPath = path_1.default.join(resultsFolderPath, 'testResults.xml');
+                        coverageReportPath = path_1.default.join(resultsFolderPath, 'coverage.lcov');
                         expectedResultsJson = {
+                            csv_result_path: resultsCsvPath,
+                            xml_result_path: resultsXmlPath,
+                            coverage_report_path: coverageReportPath,
+                            tests_that_pass: '2/7 (29%)',
+                            tests_with_results: '7/8 (88%)',
+                            target_name: target.name,
+                            target_server_url: target.serverUrl,
+                            target_server_type: target.serverType,
+                            local_date_time: expect.anything(),
+                            local_user_id: expect.anything(),
+                            local_machine_name: expect.anything(),
                             sasjs_test_meta: [
                                 {
                                     test_target: 'testsetup',
@@ -222,8 +238,6 @@ describe('sasjs test', function () {
                         return [4 /*yield*/, (0, test_1.runTest)(target, undefined, undefined, undefined, true)];
                     case 1:
                         _a.sent();
-                        resultsFolderPath = path_1.default.join(__dirname, target.name, 'sasjsresults');
-                        resultsJsonPath = path_1.default.join(resultsFolderPath, 'testResults.json');
                         return [4 /*yield*/, expect((0, utils_1.folderExists)(resultsFolderPath)).resolves.toEqual(true)];
                     case 2:
                         _a.sent();
@@ -233,7 +247,6 @@ describe('sasjs test', function () {
                         return [4 /*yield*/, (0, utils_1.readFile)(resultsJsonPath)];
                     case 4:
                         resultsJson = _a.sent();
-                        resultsCsvPath = path_1.default.join(resultsFolderPath, 'testResults.csv');
                         return [4 /*yield*/, expect((0, utils_1.fileExists)(resultsCsvPath)).resolves.toEqual(true)];
                     case 5:
                         _a.sent();
@@ -245,7 +258,6 @@ describe('sasjs test', function () {
                         resultsCsv = _a.sent();
                         resultsCsv = resultsCsv.replace(/\b[0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12}\b/g, 'sasjs_test_id');
                         expect(resultsCsv).toEqual(expectedResultsCsv);
-                        resultsXmlPath = path_1.default.join(resultsFolderPath, 'testResults.xml');
                         return [4 /*yield*/, expect((0, utils_1.fileExists)(resultsXmlPath)).resolves.toEqual(true)];
                     case 7:
                         _a.sent();
@@ -269,11 +281,32 @@ describe('sasjs test', function () {
             });
         }); });
         it('should execute filtered tests and create result CSV, XML and JSON files using custom source and output locations', function () { return __awaiter(void 0, void 0, void 0, function () {
-            var expectedResultsJson, expectedResultsCsv, outputFolder, movedTestFlow, resultsFolderPath, resultsJsonPath, resultsJson, resultsCsvPath, parsedResults, resultsCsv, logFolder, logPath, log, resultsXmlPath, resultsXml, expectedResultsXml;
+            var outputFolder, movedTestFlow, resultsFolderPath, resultsJsonPath, resultsCsvPath, resultsXmlPath, coverageReportPath, expectedResultsJson, expectedResultsCsv, resultsJson, parsedResults, resultsCsv, logFolder, logPath, log, resultsXml, expectedResultsXml;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        outputFolder = 'customOutPut';
+                        movedTestFlow = 'movedTestFlow.json';
+                        return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, target.name, 'sasjsbuild', 'testFlow.json'), path_1.default.join(__dirname, target.name, movedTestFlow))];
+                    case 1:
+                        _a.sent();
+                        resultsFolderPath = path_1.default.join(__dirname, target.name, outputFolder);
+                        resultsJsonPath = path_1.default.join(resultsFolderPath, 'testResults.json');
+                        resultsCsvPath = path_1.default.join(resultsFolderPath, 'testResults.csv');
+                        resultsXmlPath = path_1.default.join(resultsFolderPath, 'testResults.xml');
+                        coverageReportPath = path_1.default.join(resultsFolderPath, 'coverage.lcov');
                         expectedResultsJson = {
+                            csv_result_path: resultsCsvPath,
+                            xml_result_path: resultsXmlPath,
+                            coverage_report_path: coverageReportPath,
+                            tests_that_pass: '0/4 (0%)',
+                            tests_with_results: '4/5 (80%)',
+                            target_name: target.name,
+                            target_server_url: target.serverUrl,
+                            target_server_type: target.serverType,
+                            local_date_time: expect.anything(),
+                            local_user_id: expect.anything(),
+                            local_machine_name: expect.anything(),
                             sasjs_test_meta: [
                                 {
                                     test_target: 'testsetup',
@@ -327,16 +360,9 @@ describe('sasjs test', function () {
                             ]
                         };
                         expectedResultsCsv = "test_target,test_loc,sasjs_test_id,test_suite_result,test_description,test_url\ntestsetup,tests/testsetup.sas,sasjs_test_id,not provided,,".concat(testUrlLink('testsetup'), "\nstandalone,tests/jobs/jobs/standalone.test.sas,sasjs_test_id,not provided,,").concat(testUrlLink('jobs/jobs/standalone.test'), "\ndostuff,tests/services/admin/dostuff.test.0.sas,sasjs_test_id,FAIL,dostuff 0 test description,").concat(testUrlLink('services/admin/dostuff.test.0'), "\ntestteardown,tests/testteardown.sas,sasjs_test_id,not provided,,").concat(testUrlLink('testteardown'), "\n");
-                        outputFolder = 'customOutPut';
-                        movedTestFlow = 'movedTestFlow.json';
-                        return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, target.name, 'sasjsbuild', 'testFlow.json'), path_1.default.join(__dirname, target.name, movedTestFlow))];
-                    case 1:
-                        _a.sent();
                         return [4 /*yield*/, (0, test_1.runTest)(target, ['jobs/standalone', 'shouldFail', 'services/admin/dostuff.test.0'], outputFolder, movedTestFlow, true)];
                     case 2:
                         _a.sent();
-                        resultsFolderPath = path_1.default.join(__dirname, target.name, outputFolder);
-                        resultsJsonPath = path_1.default.join(resultsFolderPath, 'testResults.json');
                         return [4 /*yield*/, expect((0, utils_1.folderExists)(resultsFolderPath)).resolves.toEqual(true)];
                     case 3:
                         _a.sent();
@@ -346,7 +372,6 @@ describe('sasjs test', function () {
                         return [4 /*yield*/, (0, utils_1.readFile)(resultsJsonPath)];
                     case 5:
                         resultsJson = _a.sent();
-                        resultsCsvPath = path_1.default.join(resultsFolderPath, 'testResults.csv');
                         return [4 /*yield*/, expect((0, utils_1.fileExists)(resultsCsvPath)).resolves.toEqual(true)];
                     case 6:
                         _a.sent();
@@ -373,7 +398,6 @@ describe('sasjs test', function () {
                     case 9:
                         log = _a.sent();
                         expect(log.length).toBeGreaterThan(0);
-                        resultsXmlPath = path_1.default.join(resultsFolderPath, 'testResults.xml');
                         return [4 /*yield*/, expect((0, utils_1.fileExists)(resultsXmlPath)).resolves.toEqual(true)];
                     case 10:
                         _a.sent();
@@ -426,11 +450,27 @@ describe('sasjs test', function () {
             });
         }); });
         it('should execute tests and create result CSV, XML and JSON files using default source and output locations', function () { return __awaiter(void 0, void 0, void 0, function () {
-            var expectedResultsJson, expectedResultsCsv, resultsFolderPath, resultsJsonPath, resultsJson, resultsCsvPath, parsedResults, resultsCsv, resultsXmlPath, resultsXml, expectedResultsXml, coverageLcovPath, coverageLcov;
+            var resultsFolderPath, resultsJsonPath, resultsCsvPath, resultsXmlPath, coverageReportPath, expectedResultsJson, expectedResultsCsv, resultsJson, parsedResults, resultsCsv, resultsXml, expectedResultsXml, coverageLcovPath, coverageLcov;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        resultsFolderPath = path_1.default.join(__dirname, target.name, 'sasjsresults');
+                        resultsJsonPath = path_1.default.join(resultsFolderPath, 'testResults.json');
+                        resultsCsvPath = path_1.default.join(resultsFolderPath, 'testResults.csv');
+                        resultsXmlPath = path_1.default.join(resultsFolderPath, 'testResults.xml');
+                        coverageReportPath = path_1.default.join(resultsFolderPath, 'coverage.lcov');
                         expectedResultsJson = {
+                            csv_result_path: resultsCsvPath,
+                            xml_result_path: resultsXmlPath,
+                            coverage_report_path: coverageReportPath,
+                            tests_that_pass: '2/8 (25%)',
+                            tests_with_results: '8/8 (100%)',
+                            target_name: target.name,
+                            target_server_url: target.serverUrl,
+                            target_server_type: target.serverType,
+                            local_date_time: expect.anything(),
+                            local_user_id: expect.anything(),
+                            local_machine_name: expect.anything(),
                             sasjs_test_meta: [
                                 {
                                     test_target: 'testsetup',
@@ -536,8 +576,6 @@ describe('sasjs test', function () {
                         return [4 /*yield*/, (0, test_1.runTest)(target, undefined, undefined, undefined, true)];
                     case 1:
                         _a.sent();
-                        resultsFolderPath = path_1.default.join(__dirname, target.name, 'sasjsresults');
-                        resultsJsonPath = path_1.default.join(resultsFolderPath, 'testResults.json');
                         return [4 /*yield*/, expect((0, utils_1.folderExists)(resultsFolderPath)).resolves.toEqual(true)];
                     case 2:
                         _a.sent();
@@ -547,7 +585,6 @@ describe('sasjs test', function () {
                         return [4 /*yield*/, (0, utils_1.readFile)(resultsJsonPath)];
                     case 4:
                         resultsJson = _a.sent();
-                        resultsCsvPath = path_1.default.join(resultsFolderPath, 'testResults.csv');
                         return [4 /*yield*/, expect((0, utils_1.fileExists)(resultsCsvPath)).resolves.toEqual(true)];
                     case 5:
                         _a.sent();
@@ -559,7 +596,6 @@ describe('sasjs test', function () {
                         resultsCsv = _a.sent();
                         resultsCsv = resultsCsv.replace(/\b[0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12}\b/g, 'sasjs_test_id');
                         expect(resultsCsv).toEqual(expectedResultsCsv);
-                        resultsXmlPath = path_1.default.join(resultsFolderPath, 'testResults.xml');
                         return [4 /*yield*/, expect((0, utils_1.fileExists)(resultsXmlPath)).resolves.toEqual(true)];
                     case 7:
                         _a.sent();

package/build/commands/testing/test.js

@@ -76,6 +76,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTestUrl = exports.runTest = void 0;
+var os_1 = __importDefault(require("os"));
 var saveOutput_1 = require("./internal/saveOutput");
 var types_1 = require("../../types");
 var file_1 = require("../../utils/file");
@@ -88,10 +89,10 @@ var utils_2 = require("../../utils/utils");
 var createSASjsInstance_1 = require("../../utils/createSASjsInstance");
 // interface
 function runTest(target, testRegExps, outDirectory, flowSourcePath, force) {
-    var _a, _b;
+    var _a, _b, _c;
     if (testRegExps === void 0) { testRegExps = []; }
     return __awaiter(this, void 0, void 0, function () {
-        var testFlowData, testFlow, flow, sasjs, authConfig, username, password, _c, sas9CredentialsError, e_1, result, isCodeExamplePrinted, printCodeExample, jsonPath, xmlPath, _d, csvData, csvPath, coverageReportPath, resultTable, testSuites, testsCount, passedTestsCount, testsWithResultsCount, failedTestsCount, testsWithoutResultCount, errorMessage;
+        var testFlowData, testFlow, flow, sasjs, authConfig, username, password, _d, sas9CredentialsError, e_1, result, isCodeExamplePrinted, printCodeExample, resultFileName, jsonPath, xmlPath, csvPath, coverageReportPath, csvData, resultTable, testSuites, testsCount, passedTestsCount, testsWithResultsCount, resultProvidedTests, passedTests, testsWithResultsPercentage, passingTestsPercentage, errorMessage, failedTestsCount, testsWithoutResultCount;
         var _this = this;
         return __generator(this, function (_e) {
             switch (_e.label) {
@@ -157,8 +158,8 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath, force) {
                         contextName: target.contextName,
                         useComputeApi: false
                     });
-                    _c = target.serverType;
-                    switch (_c) {
+                    _d = target.serverType;
+                    switch (_d) {
                         case utils_1.ServerType.SasViya: return [3 /*break*/, 2];
                         case utils_1.ServerType.Sas9: return [3 /*break*/, 4];
                         case utils_1.ServerType.Sasjs: return [3 /*break*/, 5];
@@ -343,20 +344,29 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath, force) {
                         }); })];
                 case 12:
                     _e.sent();
-                    return [4 /*yield*/, (0, saveOutput_1.saveResultJson)(outDirectory, result)];
+                    resultFileName = 'testResults';
+                    jsonPath = path_1.default.join(outDirectory, "".concat(resultFileName, ".json"));
+                    xmlPath = path_1.default.join(outDirectory, "".concat(resultFileName, ".xml"));
+                    csvPath = path_1.default.join(outDirectory, "".concat(resultFileName, ".csv"));
+                    coverageReportPath = path_1.default.join(outDirectory, 'coverage.lcov');
+                    result.local_date_time = new Date().toISOString();
+                    result.local_user_id = os_1.default.userInfo().username;
+                    result.local_machine_name = os_1.default.hostname();
+                    result.target_name = target.name;
+                    result.target_server_type = target.serverType;
+                    result.target_server_url = target.serverUrl;
+                    result.csv_result_path = csvPath;
+                    result.xml_result_path = xmlPath;
+                    result.coverage_report_path = coverageReportPath;
+                    return [4 /*yield*/, (0, saveOutput_1.saveResultXml)(xmlPath, result)];
                 case 13:
-                    jsonPath = _e.sent();
-                    if (!jsonPath)
-                        return [2 /*return*/];
-                    return [4 /*yield*/, (0, saveOutput_1.saveResultXml)(outDirectory, result)];
+                    _e.sent();
+                    return [4 /*yield*/, (0, saveOutput_1.saveResultCsv)(csvPath, result)];
                 case 14:
-                    xmlPath = _e.sent();
-                    return [4 /*yield*/, (0, saveOutput_1.saveResultCsv)(outDirectory, result)];
+                    csvData = _e.sent();
+                    return [4 /*yield*/, (0, saveOutput_1.saveCoverageLcov)(coverageReportPath, flow)];
                 case 15:
-                    _d = _e.sent(), csvData = _d.csvData, csvPath = _d.csvPath;
-                    return [4 /*yield*/, (0, saveOutput_1.saveCoverageLcov)(outDirectory, flow)];
-                case 16:
-                    coverageReportPath = _e.sent();
+                    _e.sent();
                     resultTable = {};
                     if (Array.isArray(csvData)) {
                         testSuites = csvData.reduce(function (acc, item) {
@@ -395,20 +405,32 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath, force) {
                     testsCount = flow.length;
                     passedTestsCount = Object.values(resultTable).filter(function (res) { return res.test_suite_result === types_1.TestResultStatus.pass; }).length;
                     testsWithResultsCount = Object.values(resultTable).filter(function (res) { return res.test_suite_result !== types_1.TestResultStatus.notProvided; }).length;
-                    (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Tests provided results: ".concat(testsWithResultsCount + '/' + testsCount, " (").concat(chalk_1.default.greenBright(Math.round((testsWithResultsCount / testsCount) * 100 || 0) + '%'), ")\n  Tests that pass: ").concat(passedTestsCount + '/' + testsWithResultsCount, " (").concat(chalk_1.default.greenBright(Math.round((passedTestsCount / testsWithResultsCount) * 100 || 0) + '%'), ")\n  "));
-                    (0, displayResult_1.displaySuccess)("Tests execution finished. The results are stored at:\n  ".concat(jsonPath, "\n  ").concat(csvPath, "\n  ").concat(xmlPath));
-                    (0, displayResult_1.displaySuccess)("Tests coverage report:\n  ".concat(coverageReportPath));
+                    resultProvidedTests = testsWithResultsCount + '/' + testsCount;
+                    passedTests = passedTestsCount + '/' + testsWithResultsCount;
+                    testsWithResultsPercentage = Math.round((testsWithResultsCount / testsCount) * 100 || 0) + '%';
+                    passingTestsPercentage = Math.round((passedTestsCount / testsWithResultsCount) * 100 || 0) + '%';
+                    result.tests_with_results = "".concat(resultProvidedTests, " (").concat(testsWithResultsPercentage, ")");
+                    result.tests_that_pass = "".concat(passedTests, " (").concat(passingTestsPercentage, ")");
+                    (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("Tests provided results: ".concat(resultProvidedTests, " (").concat(chalk_1.default.greenBright(testsWithResultsPercentage), ")"));
+                    (_c = process.logger) === null || _c === void 0 ? void 0 : _c.info("\n  Tests that pass: ".concat(passedTests, " (").concat(chalk_1.default.greenBright(passingTestsPercentage), ")\n  "));
+                    errorMessage = '';
                     if (!force) {
                         failedTestsCount = testsWithResultsCount - passedTestsCount;
                         testsWithoutResultCount = testsCount - testsWithResultsCount;
-                        errorMessage = '';
+                        result.failed_to_complete = failedTestsCount;
+                        result.completed_with_failures = testsWithoutResultCount;
                         if (testsWithoutResultCount > 0)
                             errorMessage = "".concat(testsWithoutResultCount, " ").concat(testsWithoutResultCount === 1 ? 'test' : 'tests', " failed to complete!\n");
                         if (failedTestsCount > 0)
                             errorMessage += "".concat(failedTestsCount, " ").concat(failedTestsCount === 1 ? 'test' : 'tests', " completed with failures!");
-                        if (errorMessage)
-                            return [2 /*return*/, Promise.reject(errorMessage)];
                     }
+                    return [4 /*yield*/, (0, saveOutput_1.saveResultJson)(jsonPath, result)];
+                case 16:
+                    _e.sent();
+                    (0, displayResult_1.displaySuccess)("Tests execution finished. The results are stored at:\n  ".concat(jsonPath, "\n  ").concat(csvPath, "\n  ").concat(xmlPath));
+                    (0, displayResult_1.displaySuccess)("Tests coverage report:\n  ".concat(coverageReportPath));
+                    if (errorMessage)
+                        return [2 /*return*/, Promise.reject(errorMessage)];
                     return [2 /*return*/];
             }
         });

package/build/commands/web/internal/getTags.d.ts

@@ -1,4 +1,5 @@
 import { JSDOM } from 'jsdom';
+export declare const getSasjsTags: (parsedHtml: JSDOM) => Element[];
 export declare const getScriptTags: (parsedHtml: JSDOM) => HTMLScriptElement[];
 export declare const getStyleInPageTags: (parsedHtml: JSDOM) => HTMLStyleElement[];
 export declare const getStyleTags: (parsedHtml: JSDOM) => HTMLLinkElement[];

package/build/commands/web/internal/getTags.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSourceTags = exports.getImgTags = exports.getFaviconTags = exports.getStyleTags = exports.getStyleInPageTags = exports.getScriptTags = void 0;
+exports.getSourceTags = exports.getImgTags = exports.getFaviconTags = exports.getStyleTags = exports.getStyleInPageTags = exports.getScriptTags = exports.getSasjsTags = void 0;
+var getSasjsTags = function (parsedHtml) {
+    return Array.from(parsedHtml.window.document.getElementsByTagName('sasjs'));
+};
+exports.getSasjsTags = getSasjsTags;
 var getScriptTags = function (parsedHtml) {
     return Array.from(parsedHtml.window.document.getElementsByTagName('script'));
 };

package/build/commands/web/internal/spec/updateSasjstag.spec.d.ts

@@ -0,0 +1,4 @@
+/**
+ * @jest-environment jsdom
+ */
+export {};

package/build/commands/web/internal/spec/updateSasjstag.spec.js

@@ -0,0 +1,61 @@
+"use strict";
+/**
+ * @jest-environment jsdom
+ */
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var utils_1 = require("@sasjs/utils");
+var updateSasjsTag_1 = require("../updateSasjsTag");
+describe('updateSasjsTag', function () {
+    it("should update links in js script", function () { return __awaiter(void 0, void 0, void 0, function () {
+        var target, tag;
+        return __generator(this, function (_a) {
+            target = {
+                serverType: utils_1.ServerType.Sasjs,
+                appLoc: '/public/app/test'
+            };
+            tag = document.createElement('sasjs');
+            tag.setAttribute('appLoc', 'need/to/update');
+            tag.setAttribute('serverType', 'sas');
+            (0, updateSasjsTag_1.updateSasjsTag)(tag, target);
+            expect(tag.getAttribute('appLoc')).toEqual('/public/app/test');
+            expect(tag.getAttribute('serverType')).toEqual(utils_1.ServerType.Sasjs);
+            return [2 /*return*/];
+        });
+    }); });
+});

package/build/commands/web/internal/updateAllTags.d.ts

@@ -1,5 +1,5 @@
 import { JSDOM } from 'jsdom';
-import { ServerType } from '@sasjs/utils';
+import { ServerType, Target } from '@sasjs/utils';
 import { AssetPathMap } from './createAssetServices';
 interface paramsType {
     webSourcePathFull: string;
@@ -12,5 +12,5 @@ interface paramsType {
  * Also updates contents to update included asset references
  * @param {JSDOM} parsedHtml- DOMWindow for index.html
  */
-export declare const updateAllTags: (parsedHtml: JSDOM, { webSourcePathFull, destinationPath, serverType, assetPathMap }: paramsType) => Promise<void>;
+export declare const updateAllTags: (parsedHtml: JSDOM, target: Target, { webSourcePathFull, destinationPath, serverType, assetPathMap }: paramsType) => Promise<void>;
 export {};

package/build/commands/web/internal/updateAllTags.js

@@ -67,19 +67,24 @@ var getTags_1 = require("./getTags");
 var updateScriptTag_1 = require("./updateScriptTag");
 var updateLinkTag_1 = require("./updateLinkTag");
 var updateStyleTag_1 = require("./updateStyleTag");
+var updateSasjsTag_1 = require("./updateSasjsTag");
 /**
  * Updates HTML Tags with correct link.
  * Also updates contents to update included asset references
  * @param {JSDOM} parsedHtml- DOMWindow for index.html
  */
-var updateAllTags = function (parsedHtml, _a) {
+var updateAllTags = function (parsedHtml, target, _a) {
     var webSourcePathFull = _a.webSourcePathFull, destinationPath = _a.destinationPath, serverType = _a.serverType, assetPathMap = _a.assetPathMap;
     return __awaiter(void 0, void 0, void 0, function () {
-        var assetsNotFound, scriptTags, styleExternalTags, styleInPageTags, styleTags, faviconTags, imgTags, sourceTags, srcTags, notFoundErrors;
+        var assetsNotFound, sasjsTags, scriptTags, styleExternalTags, styleInPageTags, styleTags, faviconTags, imgTags, sourceTags, srcTags, notFoundErrors;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     assetsNotFound = [];
+                    sasjsTags = (0, getTags_1.getSasjsTags)(parsedHtml);
+                    if (sasjsTags.length) {
+                        (0, updateSasjsTag_1.updateSasjsTag)(sasjsTags[0], target);
+                    }
                     scriptTags = (0, getTags_1.getScriptTags)(parsedHtml);
                     return [4 /*yield*/, (0, utils_1.asyncForEach)(scriptTags, function (tag) { return __awaiter(void 0, void 0, void 0, function () {
                             return __generator(this, function (_a) {

package/build/commands/web/internal/updateSasjsTag.d.ts

@@ -0,0 +1,5 @@
+import { Target } from '@sasjs/utils';
+/**
+ * Updates sasjs adapter's config in index.html if present.
+ */
+export declare const updateSasjsTag: (tag: Element, target: Target) => void;

package/build/commands/web/internal/updateSasjsTag.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateSasjsTag = void 0;
+/**
+ * Updates sasjs adapter's config in index.html if present.
+ */
+var updateSasjsTag = function (tag, target) {
+    tag.setAttribute('appLoc', target.appLoc);
+    tag.setAttribute('serverType', target.serverType);
+};
+exports.updateSasjsTag = updateSasjsTag;

package/build/commands/web/web.js

@@ -98,7 +98,7 @@ function createWebAppServices(target) {
                     return [4 /*yield*/, (0, utils_1.readFile)(indexHtmlPath).then(function (content) { return new jsdom_1.default.JSDOM(content); })];
                 case 8:
                     indexHtml = _e.sent();
-                    return [4 /*yield*/, (0, updateAllTags_1.updateAllTags)(indexHtml, {
+                    return [4 /*yield*/, (0, updateAllTags_1.updateAllTags)(indexHtml, target, {
                             webSourcePathFull: webSourcePathFull,
                             destinationPath: destinationPath,
                             serverType: target.serverType,

package/build/types/testing.d.ts

@@ -1,3 +1,4 @@
+import { ServerType } from '@sasjs/utils';
 export interface TestFlow {
     testSetUp?: string;
     testTearDown?: string;
@@ -41,6 +42,19 @@ export interface TestResult {
 }
 export interface TestResults {
     sasjs_test_meta: TestDescription[];
+    csv_result_path?: string;
+    xml_result_path?: string;
+    coverage_report_path?: string;
+    failed_to_complete?: number;
+    completed_with_failures?: number;
+    tests_with_results?: string;
+    tests_that_pass?: string;
+    target_name?: string;
+    target_server_url?: string;
+    target_server_type?: ServerType;
+    local_date_time?: string;
+    local_user_id?: string;
+    local_machine_name?: string;
 }
 export interface TestResultCsv {
     test_target: string;

package/package.json

@@ -101,5 +101,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.26.0"
+  "version": "3.27.1"
 }