@sasjs/cli 3.9.0 → 3.10.2

package/build/commands/request/spec/request.spec.server.js

@@ -10,6 +10,25 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 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) {
@@ -54,6 +73,7 @@ var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
 var utils_2 = require("@sasjs/utils");
 var test_1 = require("../../../utils/test");
+var timeStampUtils = __importStar(require("@sasjs/utils/time"));
 var config_1 = require("../../../utils/config");
 var request_1 = require("../request");
 var build_1 = require("../../build/build");
@@ -92,14 +112,17 @@ var expectedDataObj = {
         }
     ]
 };
-var getOutputJson = function () { return __awaiter(void 0, void 0, void 0, function () { var _a, _b; return __generator(this, function (_c) {
-    switch (_c.label) {
-        case 0:
-            _b = (_a = JSON).parse;
-            return [4 /*yield*/, (0, utils_1.readFile)(path_1.default.join(process.projectDir, 'output.json'))];
-        case 1: return [2 /*return*/, _b.apply(_a, [_c.sent()])];
-    }
-}); }); };
+var getOutputJson = function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                _b = (_a = JSON).parse;
+                return [4 /*yield*/, (0, utils_1.readFile)(path_1.default.join(process.sasjsConstants.buildDestinationResultsFolder, 'requests', fileName))];
+            case 1: return [2 /*return*/, _b.apply(_a, [_c.sent()])];
+        }
+    });
+}); };
 describe('sasjs request without compute API', function () {
     var appName = 'cli-tests-request-' + (0, utils_2.generateTimestamp)();
     var target = (0, test_1.generateTestTarget)(appName, "/Public/app/cli-tests/".concat(appName), {
@@ -165,18 +188,24 @@ describe('sasjs request without compute API', function () {
         });
     }); });
     it("should execute service 'sendArr' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendArr"), dataPathRel, undefined, authConfig)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendArr-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendArr"), dataPathRel, undefined, authConfig)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
                     return [2 /*return*/];
@@ -184,18 +213,24 @@ describe('sasjs request without compute API', function () {
         });
     }); });
     it("should execute service 'sendObj' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendObj"), dataPathRel, undefined, authConfig)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendObj-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendObj"), dataPathRel, undefined, authConfig)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
                     return [2 /*return*/];
@@ -203,18 +238,24 @@ describe('sasjs request without compute API', function () {
         });
     }); });
     it("should execute service 'sendArr' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendArr', dataPathRel, undefined, authConfig)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendArr-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendArr', dataPathRel, undefined, authConfig)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
                     return [2 /*return*/];
@@ -222,18 +263,24 @@ describe('sasjs request without compute API', function () {
         });
     }); });
     it("should execute service 'sendObj' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendObj', dataPathRel, undefined, authConfig)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendObj-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendObj', dataPathRel, undefined, authConfig)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
                     return [2 /*return*/];
@@ -258,7 +305,7 @@ describe('sasjs request without compute API', function () {
         });
     }); });
     it("should execute service 'err' with absolute path with log path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var jobPath, log, rawLogDataStats, rawDataStats;
+        var jobPath, log, rawLogDataStats;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -268,15 +315,13 @@ describe('sasjs request without compute API', function () {
                 case 1:
                     _a.sent();
                     rawLogDataStats = (0, fs_1.statSync)(log);
-                    rawDataStats = (0, fs_1.statSync)(path_1.default.join(process.projectDir, 'output.json'));
                     expect(rawLogDataStats.size).toBeGreaterThan(10);
-                    expect(rawDataStats.size).toBeGreaterThan(10);
                     return [2 /*return*/];
             }
         });
     }); });
     it("should execute service 'err' with absolute path with default log path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var jobPath, log, rawLogDataStats, rawDataStats;
+        var jobPath, log, rawLogDataStats;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -286,9 +331,7 @@ describe('sasjs request without compute API', function () {
                 case 1:
                     _a.sent();
                     rawLogDataStats = (0, fs_1.statSync)(log);
-                    rawDataStats = (0, fs_1.statSync)(path_1.default.join(process.projectDir, 'output.json'));
                     expect(rawLogDataStats.size).toBeGreaterThan(10);
-                    expect(rawDataStats.size).toBeGreaterThan(10);
                     return [2 /*return*/];
             }
         });
@@ -355,18 +398,24 @@ describe('sasjs request with SAS9', function () {
         });
     }); });
     it("should execute service 'sendArr' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendArr"), dataPathRel)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendArr-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendArr"), dataPathRel)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
                     return [2 /*return*/];
@@ -374,18 +423,24 @@ describe('sasjs request with SAS9', function () {
         });
     }); });
     it("should execute service 'sendObj' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendObj"), dataPathRel)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendObj-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendObj"), dataPathRel)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
                     return [2 /*return*/];
@@ -393,18 +448,24 @@ describe('sasjs request with SAS9', function () {
         });
     }); });
     it("should execute service 'sendArr' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendArr', dataPathRel)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendArr-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendArr', dataPathRel)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
                     return [2 /*return*/];
@@ -412,18 +473,24 @@ describe('sasjs request with SAS9', function () {
         });
     }); });
     it("should execute service 'sendObj' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendObj', dataPathRel)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendObj-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendObj', dataPathRel)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
                     return [2 /*return*/];
@@ -448,7 +515,7 @@ describe('sasjs request with SAS9', function () {
         });
     }); });
     it("should execute service 'err' with absolute path with log path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var jobPath, log, rawLogDataStats, rawDataStats;
+        var jobPath, log, rawLogDataStats;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -458,15 +525,13 @@ describe('sasjs request with SAS9', function () {
                 case 1:
                     _a.sent();
                     rawLogDataStats = (0, fs_1.statSync)(log);
-                    rawDataStats = (0, fs_1.statSync)(path_1.default.join(process.projectDir, 'output.json'));
                     expect(rawLogDataStats.size).toBeGreaterThan(10);
-                    expect(rawDataStats.size).toBeGreaterThan(10);
                     return [2 /*return*/];
             }
         });
     }); });
     it("should execute service 'err' with absolute path with default log path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var jobPath, log, rawLogDataStats, rawDataStats;
+        var jobPath, log, rawLogDataStats;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -476,9 +541,7 @@ describe('sasjs request with SAS9', function () {
                 case 1:
                     _a.sent();
                     rawLogDataStats = (0, fs_1.statSync)(log);
-                    rawDataStats = (0, fs_1.statSync)(path_1.default.join(process.projectDir, 'output.json'));
                     expect(rawLogDataStats.size).toBeGreaterThan(10);
-                    expect(rawDataStats.size).toBeGreaterThan(10);
                     return [2 /*return*/];
             }
         });
@@ -544,18 +607,24 @@ describe("sasjs request with compute API", function () {
         });
     }); });
     it("should execute service 'sendArr' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendArr"), dataPathRel, configPathRel, authConfig)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendArr-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendArr"), dataPathRel, configPathRel, authConfig)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
                     return [2 /*return*/];
@@ -563,18 +632,24 @@ describe("sasjs request with compute API", function () {
         });
     }); });
     it("should execute service 'sendObj' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendObj"), dataPathRel, configPathRel, authConfig)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendObj-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendObj"), dataPathRel, configPathRel, authConfig)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
                     return [2 /*return*/];
@@ -582,18 +657,24 @@ describe("sasjs request with compute API", function () {
         });
     }); });
     it("should execute service 'sendArr' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendArr', dataPathRel, undefined, authConfig)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendArr-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendArr', dataPathRel, undefined, authConfig)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
                     return [2 /*return*/];
@@ -601,18 +682,24 @@ describe("sasjs request with compute API", function () {
         });
     }); });
     it("should execute service 'sendObj' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, _b;
+        var timestamp, outputFilename, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendObj', dataPathRel, undefined, authConfig)).toResolve()];
+                case 0:
+                    timestamp = (0, utils_2.generateTimestamp)();
+                    jest
+                        .spyOn(timeStampUtils, 'generateTimestamp')
+                        .mockImplementationOnce(function () { return timestamp; });
+                    outputFilename = "sendObj-".concat(timestamp, ".json");
+                    return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendObj', dataPathRel, undefined, authConfig)).toResolve()];
                 case 1:
                     _c.sent();
                     _a = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 2:
                     _a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
                     _b = expect;
-                    return [4 /*yield*/, getOutputJson()];
+                    return [4 /*yield*/, getOutputJson(outputFilename)];
                 case 3:
                     _b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
                     return [2 /*return*/];

package/build/commands/testing/test.js

@@ -122,7 +122,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                     flow = [];
                     if (testFlow.testSetUp)
                         flow.push(testFlow.testSetUp);
-                    if (testFlow.tests)
+                    if (testFlow.tests) {
                         flow = __spreadArray(__spreadArray([], __read(flow), false), __read(testFlow.tests.filter(function (test) {
                             var e_2, _a;
                             if (!testRegExps.length)
@@ -144,6 +144,7 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                             }
                             return match;
                         })), false);
+                    }
                     if (testFlow.testTearDown)
                         flow.push(testFlow.testTearDown);
                     sasjs = (0, createSASjsInstance_1.createSASjsInstance)({
@@ -190,7 +191,8 @@ function runTest(target, testRegExps, outDirectory, flowSourcePath) {
                 case 7:
                     e_1 = _e.sent();
                     return [3 /*break*/, 8];
-                case 8: return [3 /*break*/, 9];
+                case 8: // FIXME: handle error properly
+                return [3 /*break*/, 9];
                 case 9:
                     result = {
                         sasjs_test_meta: []

package/build/utils/config.js

@@ -686,11 +686,10 @@ function getMacroFolders(target) {
                     return [4 /*yield*/, getLocalOrGlobalConfig()];
                 case 1:
                     localConfig = (_a.sent()).configuration;
+                    if (target === null || target === void 0 ? void 0 : target.macroFolders)
+                        macroFolders = target.macroFolders;
                     if (localConfig === null || localConfig === void 0 ? void 0 : localConfig.macroFolders) {
-                        macroFolders = localConfig.macroFolders;
-                    }
-                    if (target === null || target === void 0 ? void 0 : target.macroFolders) {
-                        macroFolders = target.macroFolders.concat(macroFolders);
+                        macroFolders = localConfig.macroFolders.concat(macroFolders);
                     }
                     buildSourceFolder = process.sasjsConstants.buildSourceFolder;
                     macroFolders = macroFolders.map(function (macroFolder) {

package/build/utils/displayResult.js

@@ -12,7 +12,7 @@ function displayError(err, errorMessage) {
     if (errorMessage === void 0) { errorMessage = ''; }
     if (errorMessage)
         errorMessage = "".concat(errorMessage, "\n");
-    if (err !== undefined) {
+    if (err) {
         var failureDetails = '';
         if (err.hasOwnProperty('error')) {
             var body = err.error || null;

package/build/utils/spec/removeComments.spec.d.ts

@@ -1 +1 @@
-export declare const sampleSasProgram = "/**\n  @file mv_createfolder.sas\n  @brief Creates a viya folder if that foloder does not already exist\n  @details Expects oauth token in a global macro variable (default\n    ACCESS_TOKEN).\n\n    options mprint;\n    %mv_createfolder(path=/Public)\n\n\n  @param path= The full path of the folder to be created\n  @param access_token_var= The global macro variable to contain the access token\n  @param grant_type= valid values are \"password\" or \"authorization_code\" (unquoted).\n    The default is authorization_code.\n\n\n  @version VIYA V.03.04\n  @author Allan Bowe\n  @source https://github.com/sasjs/core\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n  @li mf_getuniquefileref.sas\n  @li mf_getuniquelibref.sas\n  @li mf_isblank.sas\n\n**/\n\n/* This is a comment\nthat spans\nmultiple lines */\n\n%macro mv_createfolder(path=\n  ,access_token_var=ACCESS_TOKEN\n  ,grant_type=authorization_code\n);";
+export declare const sampleSasProgram: string;

package/build/utils/spec/removeComments.spec.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sampleSasProgram = void 0;
 var utils_1 = require("../utils");
+var utils_2 = require("@sasjs/utils");
 describe('removeComments', function () {
     test('should remove block comment', function () {
         var text = "/* test\n123\n456\n789 */";
@@ -43,4 +44,4 @@ describe('removeComments', function () {
         expect((0, utils_1.removeComments)(text)).toEqual(text);
     });
 });
-exports.sampleSasProgram = "/**\n  @file mv_createfolder.sas\n  @brief Creates a viya folder if that foloder does not already exist\n  @details Expects oauth token in a global macro variable (default\n    ACCESS_TOKEN).\n\n    options mprint;\n    %mv_createfolder(path=/Public)\n\n\n  @param path= The full path of the folder to be created\n  @param access_token_var= The global macro variable to contain the access token\n  @param grant_type= valid values are \"password\" or \"authorization_code\" (unquoted).\n    The default is authorization_code.\n\n\n  @version VIYA V.03.04\n  @author Allan Bowe\n  @source https://github.com/sasjs/core\n\n  <h4> SAS Macros </h4>\n  @li mf_abort.sas\n  @li mf_getuniquefileref.sas\n  @li mf_getuniquelibref.sas\n  @li mf_isblank.sas\n\n**/\n\n/* This is a comment\nthat spans\nmultiple lines */\n\n%macro mv_createfolder(path=\n  ,access_token_var=ACCESS_TOKEN\n  ,grant_type=authorization_code\n);";
+exports.sampleSasProgram = "/**\n  @file mv_createfolder.sas\n  @brief Creates a viya folder if that foloder does not already exist\n  @details Expects oauth token in a global macro variable (default\n    ACCESS_TOKEN).\n\n    options mprint;\n    %mv_createfolder(path=/Public)\n\n\n  @param path= The full path of the folder to be created\n  @param access_token_var= The global macro variable to contain the access token\n  @param grant_type= valid values are \"password\" or \"authorization_code\" (unquoted).\n    The default is authorization_code.\n\n\n  @version VIYA V.03.04\n  @author Allan Bowe\n  @source https://github.com/sasjs/core\n\n  ".concat(utils_2.DependencyHeader.Macro, "\n  @li mf_abort.sas\n  @li mf_getuniquefileref.sas\n  @li mf_getuniquelibref.sas\n  @li mf_isblank.sas\n\n**/\n\n/* This is a comment\nthat spans\nmultiple lines */\n\n%macro mv_createfolder(path=\n  ,access_token_var=ACCESS_TOKEN\n  ,grant_type=authorization_code\n);");

package/build/utils/utils.d.ts

@@ -34,5 +34,12 @@ export declare function getAdapterInstance(target: Target): SASjs;
 export declare function displaySasjsRunnerError(username: string): void;
 export declare const loadEnvVariables: (fileName: string) => Promise<void>;
 export declare function prefixAppLoc(appLoc?: string, path?: string): string | null;
-export declare const isWindows: () => boolean;
 export declare const terminateProcess: (status: number) => never;
+/**
+ * This function checks whether the current directory, or any of the parent
+ * directories, are part of a SASjs project.  This is done by testing for
+ * the existence of a ./sasjs/sasjsconfig.json file.
+ *
+ * @returns boolean
+ */
+export declare const isSASjsProject: () => Promise<boolean>;

package/build/utils/utils.js

@@ -86,7 +86,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.terminateProcess = exports.isWindows = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGhooks = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
+exports.isSASjsProject = exports.terminateProcess = exports.prefixAppLoc = exports.loadEnvVariables = exports.displaySasjsRunnerError = exports.getAdapterInstance = exports.checkNodeVersion = exports.millisecondsToDdHhMmSs = exports.arrToObj = exports.parseLogLines = exports.executeShellScript = exports.getUniqServicesObj = exports.removeComments = exports.setupDoxygen = exports.setupGhooks = exports.setupGitIgnore = exports.setupNpmProject = exports.createTemplateApp = exports.createMinimalApp = exports.createAngularApp = exports.createReactApp = exports.diff = exports.inExistingProject = void 0;
 var shelljs_1 = __importDefault(require("shelljs"));
 var path_1 = __importDefault(require("path"));
 var ora_1 = __importDefault(require("ora"));
@@ -414,7 +414,7 @@ function executeShellScript(filePath, logFilePath) {
                     return __generator(this, function (_b) {
                         switch (_b.label) {
                             case 0:
-                                shellCommand = (0, exports.isWindows)() ? "sh ".concat(filePath) : "bash ".concat(filePath);
+                                shellCommand = (0, utils_1.isWindows)() ? "sh ".concat(filePath) : "bash ".concat(filePath);
                                 result = shelljs_1.default.exec(shellCommand, { silent: true });
                                 if (!result.code) return [3 /*break*/, 1];
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error("Error: ".concat(result.stderr));
@@ -555,11 +555,49 @@ function prefixAppLoc(appLoc, path) {
         .join(' ');
 }
 exports.prefixAppLoc = prefixAppLoc;
-var isWindows = function () { return process.platform === 'win32'; };
-exports.isWindows = isWindows;
 var terminateProcess = function (status) {
     var _a;
     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info("Process will be terminated with the status code ".concat(status, "."));
     process.exit(status);
 };
 exports.terminateProcess = terminateProcess;
+/**
+ * This function checks whether the current directory, or any of the parent
+ * directories, are part of a SASjs project.  This is done by testing for
+ * the existence of a ./sasjs/sasjsconfig.json file.
+ *
+ * @returns boolean
+ */
+var isSASjsProject = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var i, currentLocation, maxLevels, _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                i = 1;
+                currentLocation = process.projectDir;
+                maxLevels = currentLocation.split(path_1.default.sep).length;
+                _b.label = 1;
+            case 1:
+                if (!(i <= maxLevels)) return [3 /*break*/, 5];
+                return [4 /*yield*/, (0, utils_1.folderExists)(path_1.default.join(currentLocation, 'sasjs'))];
+            case 2:
+                _a = (_b.sent());
+                if (!_a) return [3 /*break*/, 4];
+                return [4 /*yield*/, (0, utils_1.fileExists)(path_1.default.join(currentLocation, 'sasjs', 'sasjsconfig.json'))];
+            case 3:
+                _a = (_b.sent());
+                _b.label = 4;
+            case 4:
+                if (_a) {
+                    return [2 /*return*/, true];
+                }
+                else {
+                    currentLocation = path_1.default.join(currentLocation, '..');
+                    i++;
+                }
+                return [3 /*break*/, 1];
+            case 5: return [2 /*return*/, false];
+        }
+    });
+}); };
+exports.isSASjsProject = isSASjsProject;