@sasjs/cli 3.6.0 → 3.6.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -3
- package/build/cli.js +4 -4
- package/build/cli.spec.js +6 -6
- package/build/commands/add/addCommand.js +2 -2
- package/build/commands/add/addCredential.js +27 -27
- package/build/commands/add/addTarget.js +10 -10
- package/build/commands/add/internal/input.js +30 -30
- package/build/commands/add/internal/saveConfig.js +2 -2
- package/build/commands/add/spec/addCommand.spec.js +24 -20
- package/build/commands/add/spec/addCredential.spec.js +14 -14
- package/build/commands/add/spec/addTarget.spec.js +22 -22
- package/build/commands/build/build.js +81 -77
- package/build/commands/build/buildCommand.js +3 -3
- package/build/commands/build/compileBuildCommand.js +4 -4
- package/build/commands/build/internal/config.js +8 -8
- package/build/commands/build/internal/getLaunchPageCode.js +2 -2
- package/build/commands/build/spec/build.spec.js +10 -10
- package/build/commands/build/spec/buildCommand.spec.js +16 -12
- package/build/commands/build/spec/cb.spec.server.js +18 -18
- package/build/commands/build/spec/compileBuildCommand.spec.js +17 -13
- package/build/commands/compile/compile.js +61 -61
- package/build/commands/compile/compileCommand.js +10 -10
- package/build/commands/compile/compileSingleFile.js +17 -17
- package/build/commands/compile/internal/checkCompileStatus.js +11 -11
- package/build/commands/compile/internal/compareFolders.js +11 -11
- package/build/commands/compile/internal/compileJobFile.js +3 -3
- package/build/commands/compile/internal/compileServiceFile.js +14 -14
- package/build/commands/compile/internal/compileTestFile.js +41 -37
- package/build/commands/compile/internal/getAllJobFolders.js +13 -9
- package/build/commands/compile/internal/getAllServiceFolders.js +13 -9
- package/build/commands/compile/internal/getServerType.js +1 -1
- package/build/commands/compile/internal/identifySasFile.js +2 -2
- package/build/commands/compile/internal/loadDependencies.js +5 -5
- package/build/commands/compile/internal/spec/compileTestFile.spec.js +40 -40
- package/build/commands/compile/spec/compareFolders.spec.js +27 -27
- package/build/commands/compile/spec/compile.spec.js +93 -93
- package/build/commands/compile/spec/compileCommand.spec.js +37 -33
- package/build/commands/compile/spec/compileJobFile.spec.js +12 -22
- package/build/commands/compile/spec/compileServiceFile.spec.js +12 -22
- package/build/commands/compile/spec/copyFilesToBuildFolder.spec.js +7 -7
- package/build/commands/compile/spec/loadDependencies.spec.js +31 -162
- package/build/commands/context/contextCommand.js +16 -16
- package/build/commands/context/create.js +1 -1
- package/build/commands/context/delete.js +2 -2
- package/build/commands/context/edit.js +1 -1
- package/build/commands/context/export.js +5 -5
- package/build/commands/context/internal/validateConfigPath.js +1 -1
- package/build/commands/context/list.js +4 -4
- package/build/commands/context/spec/contextCommand.spec.js +80 -76
- package/build/commands/context/spec/create.spec.js +3 -3
- package/build/commands/context/spec/delete.spec.js +3 -3
- package/build/commands/context/spec/edit.spec.js +3 -3
- package/build/commands/context/spec/export.spec.js +8 -8
- package/build/commands/context/spec/list.spec.js +5 -5
- package/build/commands/create/create.js +12 -12
- package/build/commands/create/createCommand.js +2 -2
- package/build/commands/create/internal/createReadme.js +2 -2
- package/build/commands/create/spec/create.spec.js +39 -39
- package/build/commands/create/spec/createCommand.spec.js +14 -10
- package/build/commands/db/db.js +22 -22
- package/build/commands/db/dbCommand.js +1 -1
- package/build/commands/db/spec/db.spec.js +8 -8
- package/build/commands/db/spec/dbCommand.spec.js +11 -7
- package/build/commands/deploy/compileBuildDeployCommand.js +6 -6
- package/build/commands/deploy/deploy.js +39 -39
- package/build/commands/deploy/deployCommand.js +2 -2
- package/build/commands/deploy/internal/getDeployScripts.js +14 -10
- package/build/commands/deploy/spec/cbd.spec.js +14 -14
- package/build/commands/deploy/spec/cbd.spec.server.js +40 -40
- package/build/commands/deploy/spec/compileBuildDeployCommand.spec.js +18 -14
- package/build/commands/deploy/spec/deployCommand.spec.js +15 -11
- package/build/commands/deploy/spec/getDeployScripts.spec.js +8 -8
- package/build/commands/deploy/spec/utils.js +17 -17
- package/build/commands/docs/docsCommand.js +7 -7
- package/build/commands/docs/generateDocs.js +33 -29
- package/build/commands/docs/generateDot.js +12 -8
- package/build/commands/docs/initDocs.js +1 -1
- package/build/commands/docs/internal/createDotFiles.js +6 -6
- package/build/commands/docs/internal/getDotFileContent.js +17 -17
- package/build/commands/docs/internal/getFileInputs.js +1 -1
- package/build/commands/docs/internal/getFileOutputs.js +1 -1
- package/build/commands/docs/internal/getFoldersForDocs.js +4 -4
- package/build/commands/docs/internal/populateNodeDictionary.js +1 -1
- package/build/commands/docs/spec/docsCommand.spec.js +25 -21
- package/build/commands/docs/spec/generateDocs.spec.js +60 -60
- package/build/commands/docs/spec/generateDot.spec.js +23 -23
- package/build/commands/docs/spec/getDocConfig.spec.js +2 -2
- package/build/commands/docs/spec/initDocs.spec.js +7 -7
- package/build/commands/flow/execute.js +8 -8
- package/build/commands/flow/flowCommand.js +5 -5
- package/build/commands/flow/internal/checkPredecessorDeadlock.js +11 -7
- package/build/commands/flow/internal/executeFlow.js +23 -23
- package/build/commands/flow/internal/failAllSuccessors.js +1 -1
- package/build/commands/flow/internal/generateFileName.js +2 -2
- package/build/commands/flow/internal/normalizeFilePath.js +1 -1
- package/build/commands/flow/internal/parseJobDetails.js +3 -3
- package/build/commands/flow/internal/printError.js +1 -1
- package/build/commands/flow/internal/saveLog.js +8 -8
- package/build/commands/flow/internal/saveToCsv.js +2 -2
- package/build/commands/flow/internal/spec/allFlowsCompleted.spec.js +4 -4
- package/build/commands/flow/internal/spec/checkPredecessorDeadlock.spec.js +4 -4
- package/build/commands/flow/internal/spec/executeFlow.spec.js +10 -10
- package/build/commands/flow/internal/spec/failAllSuccessors.spec.js +1 -1
- package/build/commands/flow/internal/spec/saveToCsv.spec.js +16 -16
- package/build/commands/flow/internal/spec/validateParams.spec.js +33 -33
- package/build/commands/flow/internal/validateParams.js +17 -17
- package/build/commands/flow/spec/flow.spec.js +1 -1
- package/build/commands/flow/spec/flow.spec.server.js +60 -60
- package/build/commands/flow/spec/flowCommand.spec.js +16 -12
- package/build/commands/folder/create.js +2 -2
- package/build/commands/folder/delete.js +2 -2
- package/build/commands/folder/folderCommand.js +11 -11
- package/build/commands/folder/move.js +2 -2
- package/build/commands/folder/spec/folder.spec.server.js +35 -35
- package/build/commands/folder/spec/folderCommand.spec.js +23 -19
- package/build/commands/help/help.js +46 -46
- package/build/commands/help/helpCommand.js +1 -1
- package/build/commands/help/spec/help.spec.js +8 -8
- package/build/commands/help/spec/helpCommand.spec.js +11 -7
- package/build/commands/init/init.js +7 -7
- package/build/commands/init/initCommand.js +1 -1
- package/build/commands/init/spec/init.spec.server.js +17 -17
- package/build/commands/init/spec/initCommand.spec.js +11 -7
- package/build/commands/job/internal/execute/sasjs.js +1 -1
- package/build/commands/job/internal/execute/viya.js +35 -35
- package/build/commands/job/internal/utils.js +6 -6
- package/build/commands/job/jobCommand.js +6 -6
- package/build/commands/job/spec/execute.spec.js +6 -6
- package/build/commands/job/spec/getContextName.spec.js +2 -2
- package/build/commands/job/spec/job.spec.server.js +53 -53
- package/build/commands/job/spec/jobCommand.spec.js +17 -13
- package/build/commands/lint/initLint.js +2 -2
- package/build/commands/lint/lintCommand.js +10 -10
- package/build/commands/lint/processLint.js +5 -5
- package/build/commands/lint/spec/lintCommand.spec.js +19 -15
- package/build/commands/request/request.js +16 -16
- package/build/commands/request/requestCommand.js +5 -5
- package/build/commands/request/spec/request.spec.server.js +210 -178
- package/build/commands/request/spec/requestCommand.spec.js +17 -13
- package/build/commands/run/run.js +23 -23
- package/build/commands/run/runCommand.js +2 -2
- package/build/commands/run/spec/run.spec.server.js +51 -51
- package/build/commands/run/spec/runCommand.spec.js +10 -6
- package/build/commands/servicepack/deploy.js +6 -6
- package/build/commands/servicepack/servicePackCommand.js +3 -3
- package/build/commands/servicepack/spec/servicepack.spec.server.js +6 -6
- package/build/commands/servicepack/spec/servicepackCommand.spec.js +10 -6
- package/build/commands/shared/createConfigFile.js +2 -2
- package/build/commands/shared/createFileStructure.js +6 -6
- package/build/commands/shared/createLintConfigFile.js +1 -1
- package/build/commands/shared/deployToSasViyaWithServicePack.js +4 -4
- package/build/commands/shared/fetchLogFileContent.js +10 -6
- package/build/commands/testing/internal/saveOutput.js +39 -35
- package/build/commands/testing/spec/testCommand.spec.js +17 -13
- package/build/commands/testing/spec/testing.spec.server.js +38 -38
- package/build/commands/testing/test.js +45 -41
- package/build/commands/testing/testCommand.js +2 -2
- package/build/commands/version/spec/version.spec.js +1 -1
- package/build/commands/version/spec/versionCommand.spec.js +11 -7
- package/build/commands/version/version.js +3 -3
- package/build/commands/version/versionCommand.js +2 -2
- package/build/commands/web/internal/createAssetServices.js +28 -24
- package/build/commands/web/internal/getWebServiceContent.js +6 -6
- package/build/commands/web/internal/sasjsout.d.ts +1 -1
- package/build/commands/web/internal/sasjsout.js +1 -1
- package/build/commands/web/internal/spec/updateLinkTag.spec.js +2 -2
- package/build/commands/web/internal/spec/updateScriptTag.spec.js +10 -10
- package/build/commands/web/internal/updateAllTags.js +19 -15
- package/build/commands/web/internal/updateLinkTag.js +2 -2
- package/build/commands/web/internal/updateScriptTag.js +6 -6
- package/build/commands/web/spec/web.spec.js +23 -23
- package/build/commands/web/spec/webCommand.spec.js +16 -12
- package/build/commands/web/web.js +25 -25
- package/build/commands/web/webCommand.js +3 -3
- package/build/types/command/commandBase.js +19 -15
- package/build/types/command/parse.js +1 -1
- package/build/types/command/spec/commandBase.spec.js +16 -12
- package/build/types/command/targetCommand.js +4 -4
- package/build/types/command/unalias.js +9 -5
- package/build/utils/auth.js +7 -7
- package/build/utils/config.js +53 -49
- package/build/utils/displayResult.js +4 -4
- package/build/utils/file.js +11 -11
- package/build/utils/fileStructures/builtFiles.js +2 -2
- package/build/utils/fileStructures/builtFilesCustom1.js +2 -2
- package/build/utils/getLogFilePath.js +2 -3
- package/build/utils/loadEnvVariables.js +3 -3
- package/build/utils/prefixAppLoc.js +1 -1
- package/build/utils/saveLog.js +7 -7
- package/build/utils/setConstants.js +4 -4
- package/build/utils/setProjectDir.js +2 -2
- package/build/utils/spec/config.spec.js +80 -80
- package/build/utils/spec/displayResult.spec.js +7 -7
- package/build/utils/spec/file.spec.js +15 -15
- package/build/utils/spec/removeComments.spec.js +11 -11
- package/build/utils/spec/setConstants.spec.js +3 -3
- package/build/utils/spec/utils.spec.js +55 -55
- package/build/utils/test.js +59 -59
- package/build/utils/utils.js +47 -43
- package/package.json +11 -11
|
@@ -92,9 +92,17 @@ var expectedDataObj = {
|
|
|
92
92
|
}
|
|
93
93
|
]
|
|
94
94
|
};
|
|
95
|
+
var getOutputJson = function () { return __awaiter(void 0, void 0, void 0, function () { var _a, _b; return __generator(this, function (_c) {
|
|
96
|
+
switch (_c.label) {
|
|
97
|
+
case 0:
|
|
98
|
+
_b = (_a = JSON).parse;
|
|
99
|
+
return [4 /*yield*/, (0, utils_1.readFile)(path_1.default.join(process.projectDir, 'output.json'))];
|
|
100
|
+
case 1: return [2 /*return*/, _b.apply(_a, [_c.sent()])];
|
|
101
|
+
}
|
|
102
|
+
}); }); };
|
|
95
103
|
describe('sasjs request without compute API', function () {
|
|
96
|
-
var appName = 'cli-tests-request-' + utils_2.generateTimestamp();
|
|
97
|
-
var target = test_1.generateTestTarget(appName, "/Public/app/cli-tests/"
|
|
104
|
+
var appName = 'cli-tests-request-' + (0, utils_2.generateTimestamp)();
|
|
105
|
+
var target = (0, test_1.generateTestTarget)(appName, "/Public/app/cli-tests/".concat(appName), {
|
|
98
106
|
serviceFolders: ['sasjs/runRequest'],
|
|
99
107
|
initProgram: '',
|
|
100
108
|
termProgram: '',
|
|
@@ -107,23 +115,23 @@ describe('sasjs request without compute API', function () {
|
|
|
107
115
|
var sasjsBuildDirPath;
|
|
108
116
|
return __generator(this, function (_a) {
|
|
109
117
|
switch (_a.label) {
|
|
110
|
-
case 0: return [4 /*yield*/, test_1.createTestApp(__dirname, appName)];
|
|
118
|
+
case 0: return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
|
|
111
119
|
case 1:
|
|
112
120
|
_a.sent();
|
|
113
|
-
return [4 /*yield*/, config_1.getAuthConfig(target)];
|
|
121
|
+
return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
|
|
114
122
|
case 2:
|
|
115
123
|
authConfig = _a.sent();
|
|
116
|
-
return [4 /*yield*/, utils_1.copy(path_1.default.join(__dirname, 'runRequest'), path_1.default.join(process.projectDir, 'sasjs', 'runRequest'))];
|
|
124
|
+
return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, 'runRequest'), path_1.default.join(process.projectDir, 'sasjs', 'runRequest'))];
|
|
117
125
|
case 3:
|
|
118
126
|
_a.sent();
|
|
119
|
-
return [4 /*yield*/, build_1.build(target)];
|
|
127
|
+
return [4 /*yield*/, (0, build_1.build)(target)];
|
|
120
128
|
case 4:
|
|
121
129
|
_a.sent();
|
|
122
|
-
return [4 /*yield*/, deploy_1.deploy(target, false)];
|
|
130
|
+
return [4 /*yield*/, (0, deploy_1.deploy)(target, false)];
|
|
123
131
|
case 5:
|
|
124
132
|
_a.sent();
|
|
125
133
|
sasjsBuildDirPath = path_1.default.join(process.projectDir, 'sasjsbuild');
|
|
126
|
-
return [4 /*yield*/, utils_1.deleteFolder(sasjsBuildDirPath)];
|
|
134
|
+
return [4 /*yield*/, (0, utils_1.deleteFolder)(sasjsBuildDirPath)];
|
|
127
135
|
case 6:
|
|
128
136
|
_a.sent();
|
|
129
137
|
return [2 /*return*/];
|
|
@@ -133,10 +141,10 @@ describe('sasjs request without compute API', function () {
|
|
|
133
141
|
afterAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
134
142
|
return __generator(this, function (_a) {
|
|
135
143
|
switch (_a.label) {
|
|
136
|
-
case 0: return [4 /*yield*/, test_1.removeTestServerFolder(target.appLoc, target)];
|
|
144
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestServerFolder)(target.appLoc, target)];
|
|
137
145
|
case 1:
|
|
138
146
|
_a.sent();
|
|
139
|
-
return [4 /*yield*/, test_1.removeTestApp(__dirname, target.name)];
|
|
147
|
+
return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, target.name)];
|
|
140
148
|
case 2:
|
|
141
149
|
_a.sent();
|
|
142
150
|
return [2 /*return*/];
|
|
@@ -146,10 +154,10 @@ describe('sasjs request without compute API', function () {
|
|
|
146
154
|
beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
147
155
|
return __generator(this, function (_a) {
|
|
148
156
|
switch (_a.label) {
|
|
149
|
-
case 0: return [4 /*yield*/, utils_1.createFile(path_1.default.join(process.projectDir, configPathRel), JSON.stringify(target.toJson(), null, 2))];
|
|
157
|
+
case 0: return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(process.projectDir, configPathRel), JSON.stringify(target.toJson(), null, 2))];
|
|
150
158
|
case 1:
|
|
151
159
|
_a.sent();
|
|
152
|
-
return [4 /*yield*/, utils_1.createFile(path_1.default.join(process.projectDir, dataPathRel), JSON.stringify(sampleDataJson, null, 2))];
|
|
160
|
+
return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(process.projectDir, dataPathRel), JSON.stringify(sampleDataJson, null, 2))];
|
|
153
161
|
case 2:
|
|
154
162
|
_a.sent();
|
|
155
163
|
return [2 /*return*/];
|
|
@@ -157,69 +165,77 @@ describe('sasjs request without compute API', function () {
|
|
|
157
165
|
});
|
|
158
166
|
}); });
|
|
159
167
|
it("should execute service 'sendArr' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
160
|
-
var
|
|
161
|
-
return __generator(this, function (
|
|
162
|
-
switch (
|
|
163
|
-
case 0: return [4 /*yield*/, expect(request_1.runSasJob(target, false, "/Public/app/cli-tests/"
|
|
168
|
+
var _a, _b;
|
|
169
|
+
return __generator(this, function (_c) {
|
|
170
|
+
switch (_c.label) {
|
|
171
|
+
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()];
|
|
164
172
|
case 1:
|
|
165
|
-
|
|
166
|
-
|
|
173
|
+
_c.sent();
|
|
174
|
+
_a = expect;
|
|
175
|
+
return [4 /*yield*/, getOutputJson()];
|
|
167
176
|
case 2:
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
177
|
+
_a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
|
|
178
|
+
_b = expect;
|
|
179
|
+
return [4 /*yield*/, getOutputJson()];
|
|
180
|
+
case 3:
|
|
181
|
+
_b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
|
|
172
182
|
return [2 /*return*/];
|
|
173
183
|
}
|
|
174
184
|
});
|
|
175
185
|
}); });
|
|
176
186
|
it("should execute service 'sendObj' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
177
|
-
var
|
|
178
|
-
return __generator(this, function (
|
|
179
|
-
switch (
|
|
180
|
-
case 0: return [4 /*yield*/, expect(request_1.runSasJob(target, false, "/Public/app/cli-tests/"
|
|
187
|
+
var _a, _b;
|
|
188
|
+
return __generator(this, function (_c) {
|
|
189
|
+
switch (_c.label) {
|
|
190
|
+
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()];
|
|
181
191
|
case 1:
|
|
182
|
-
|
|
183
|
-
|
|
192
|
+
_c.sent();
|
|
193
|
+
_a = expect;
|
|
194
|
+
return [4 /*yield*/, getOutputJson()];
|
|
184
195
|
case 2:
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
196
|
+
_a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
|
|
197
|
+
_b = expect;
|
|
198
|
+
return [4 /*yield*/, getOutputJson()];
|
|
199
|
+
case 3:
|
|
200
|
+
_b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
|
|
189
201
|
return [2 /*return*/];
|
|
190
202
|
}
|
|
191
203
|
});
|
|
192
204
|
}); });
|
|
193
205
|
it("should execute service 'sendArr' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
194
|
-
var
|
|
195
|
-
return __generator(this, function (
|
|
196
|
-
switch (
|
|
197
|
-
case 0: return [4 /*yield*/, expect(request_1.runSasJob(target, false, 'services/runRequest/sendArr', dataPathRel, undefined, authConfig)).toResolve()];
|
|
206
|
+
var _a, _b;
|
|
207
|
+
return __generator(this, function (_c) {
|
|
208
|
+
switch (_c.label) {
|
|
209
|
+
case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendArr', dataPathRel, undefined, authConfig)).toResolve()];
|
|
198
210
|
case 1:
|
|
199
|
-
|
|
200
|
-
|
|
211
|
+
_c.sent();
|
|
212
|
+
_a = expect;
|
|
213
|
+
return [4 /*yield*/, getOutputJson()];
|
|
201
214
|
case 2:
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
215
|
+
_a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
|
|
216
|
+
_b = expect;
|
|
217
|
+
return [4 /*yield*/, getOutputJson()];
|
|
218
|
+
case 3:
|
|
219
|
+
_b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
|
|
206
220
|
return [2 /*return*/];
|
|
207
221
|
}
|
|
208
222
|
});
|
|
209
223
|
}); });
|
|
210
224
|
it("should execute service 'sendObj' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
211
|
-
var
|
|
212
|
-
return __generator(this, function (
|
|
213
|
-
switch (
|
|
214
|
-
case 0: return [4 /*yield*/, expect(request_1.runSasJob(target, false, 'services/runRequest/sendObj', dataPathRel, undefined, authConfig)).toResolve()];
|
|
225
|
+
var _a, _b;
|
|
226
|
+
return __generator(this, function (_c) {
|
|
227
|
+
switch (_c.label) {
|
|
228
|
+
case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendObj', dataPathRel, undefined, authConfig)).toResolve()];
|
|
215
229
|
case 1:
|
|
216
|
-
|
|
217
|
-
|
|
230
|
+
_c.sent();
|
|
231
|
+
_a = expect;
|
|
232
|
+
return [4 /*yield*/, getOutputJson()];
|
|
218
233
|
case 2:
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
234
|
+
_a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
|
|
235
|
+
_b = expect;
|
|
236
|
+
return [4 /*yield*/, getOutputJson()];
|
|
237
|
+
case 3:
|
|
238
|
+
_b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
|
|
223
239
|
return [2 /*return*/];
|
|
224
240
|
}
|
|
225
241
|
});
|
|
@@ -228,10 +244,10 @@ describe('sasjs request without compute API', function () {
|
|
|
228
244
|
var rawData, output;
|
|
229
245
|
return __generator(this, function (_a) {
|
|
230
246
|
switch (_a.label) {
|
|
231
|
-
case 0: return [4 /*yield*/, expect(request_1.runSasJob(target, false, "/Public/app/cli-tests/"
|
|
247
|
+
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, undefined, undefined, './myoutput.json')).toResolve()];
|
|
232
248
|
case 1:
|
|
233
249
|
_a.sent();
|
|
234
|
-
return [4 /*yield*/, utils_1.readFile(process.projectDir
|
|
250
|
+
return [4 /*yield*/, (0, utils_1.readFile)(path_1.default.join(process.projectDir, 'myoutput.json'))];
|
|
235
251
|
case 2:
|
|
236
252
|
rawData = _a.sent();
|
|
237
253
|
output = JSON.parse(rawData);
|
|
@@ -246,13 +262,13 @@ describe('sasjs request without compute API', function () {
|
|
|
246
262
|
return __generator(this, function (_a) {
|
|
247
263
|
switch (_a.label) {
|
|
248
264
|
case 0:
|
|
249
|
-
jobPath = utils_3.prefixAppLoc(target.appLoc,
|
|
250
|
-
log = getLogFilePath_1.getLogFilePath('./mylog.txt', jobPath || '');
|
|
251
|
-
return [4 /*yield*/, expect(request_1.runSasJob(target, false,
|
|
265
|
+
jobPath = (0, utils_3.prefixAppLoc)(target.appLoc, 'services/runRequest/err');
|
|
266
|
+
log = (0, getLogFilePath_1.getLogFilePath)('./mylog.txt', jobPath || '');
|
|
267
|
+
return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, jobPath, dataPathRel, undefined, authConfig, log, jobPath)).toResolve()];
|
|
252
268
|
case 1:
|
|
253
269
|
_a.sent();
|
|
254
|
-
rawLogDataStats = fs_1.statSync(
|
|
255
|
-
rawDataStats = fs_1.statSync(process.projectDir
|
|
270
|
+
rawLogDataStats = (0, fs_1.statSync)(log);
|
|
271
|
+
rawDataStats = (0, fs_1.statSync)(path_1.default.join(process.projectDir, 'output.json'));
|
|
256
272
|
expect(rawLogDataStats.size).toBeGreaterThan(10);
|
|
257
273
|
expect(rawDataStats.size).toBeGreaterThan(10);
|
|
258
274
|
return [2 /*return*/];
|
|
@@ -264,13 +280,13 @@ describe('sasjs request without compute API', function () {
|
|
|
264
280
|
return __generator(this, function (_a) {
|
|
265
281
|
switch (_a.label) {
|
|
266
282
|
case 0:
|
|
267
|
-
jobPath = utils_3.prefixAppLoc(target.appLoc,
|
|
268
|
-
log = getLogFilePath_1.getLogFilePath('', jobPath || '');
|
|
269
|
-
return [4 /*yield*/, expect(request_1.runSasJob(target, false,
|
|
283
|
+
jobPath = (0, utils_3.prefixAppLoc)(target.appLoc, 'services/runRequest/err');
|
|
284
|
+
log = (0, getLogFilePath_1.getLogFilePath)('', jobPath || '');
|
|
285
|
+
return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, jobPath, dataPathRel, undefined, authConfig, log, jobPath)).toResolve()];
|
|
270
286
|
case 1:
|
|
271
287
|
_a.sent();
|
|
272
|
-
rawLogDataStats = fs_1.statSync(
|
|
273
|
-
rawDataStats = fs_1.statSync(process.projectDir
|
|
288
|
+
rawLogDataStats = (0, fs_1.statSync)(log);
|
|
289
|
+
rawDataStats = (0, fs_1.statSync)(path_1.default.join(process.projectDir, 'output.json'));
|
|
274
290
|
expect(rawLogDataStats.size).toBeGreaterThan(10);
|
|
275
291
|
expect(rawDataStats.size).toBeGreaterThan(10);
|
|
276
292
|
return [2 /*return*/];
|
|
@@ -279,8 +295,8 @@ describe('sasjs request without compute API', function () {
|
|
|
279
295
|
}); });
|
|
280
296
|
});
|
|
281
297
|
describe('sasjs request with SAS9', function () {
|
|
282
|
-
var appName = 'cli-tests-request-sas9-' + utils_2.generateTimestamp();
|
|
283
|
-
var target = test_1.generateTestTarget(appName, "/Public/app/cli-tests/"
|
|
298
|
+
var appName = 'cli-tests-request-sas9-' + (0, utils_2.generateTimestamp)();
|
|
299
|
+
var target = (0, test_1.generateTestTarget)(appName, "/Public/app/cli-tests/".concat(appName), {
|
|
284
300
|
serviceFolders: ['sasjs/runRequest'],
|
|
285
301
|
initProgram: '',
|
|
286
302
|
termProgram: '',
|
|
@@ -292,20 +308,20 @@ describe('sasjs request with SAS9', function () {
|
|
|
292
308
|
var sasjsBuildDirPath;
|
|
293
309
|
return __generator(this, function (_a) {
|
|
294
310
|
switch (_a.label) {
|
|
295
|
-
case 0: return [4 /*yield*/, test_1.createTestApp(__dirname, appName)];
|
|
311
|
+
case 0: return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
|
|
296
312
|
case 1:
|
|
297
313
|
_a.sent();
|
|
298
|
-
return [4 /*yield*/, utils_1.copy(path_1.default.join(__dirname, 'runRequest'), path_1.default.join(process.projectDir, 'sasjs', 'runRequest'))];
|
|
314
|
+
return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, 'runRequest'), path_1.default.join(process.projectDir, 'sasjs', 'runRequest'))];
|
|
299
315
|
case 2:
|
|
300
316
|
_a.sent();
|
|
301
|
-
return [4 /*yield*/, build_1.build(target)];
|
|
317
|
+
return [4 /*yield*/, (0, build_1.build)(target)];
|
|
302
318
|
case 3:
|
|
303
319
|
_a.sent();
|
|
304
|
-
return [4 /*yield*/, deploy_1.deploy(target, false)];
|
|
320
|
+
return [4 /*yield*/, (0, deploy_1.deploy)(target, false)];
|
|
305
321
|
case 4:
|
|
306
322
|
_a.sent();
|
|
307
323
|
sasjsBuildDirPath = path_1.default.join(process.projectDir, 'sasjsbuild');
|
|
308
|
-
return [4 /*yield*/, utils_1.deleteFolder(sasjsBuildDirPath)];
|
|
324
|
+
return [4 /*yield*/, (0, utils_1.deleteFolder)(sasjsBuildDirPath)];
|
|
309
325
|
case 5:
|
|
310
326
|
_a.sent();
|
|
311
327
|
return [2 /*return*/];
|
|
@@ -315,10 +331,10 @@ describe('sasjs request with SAS9', function () {
|
|
|
315
331
|
afterAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
316
332
|
return __generator(this, function (_a) {
|
|
317
333
|
switch (_a.label) {
|
|
318
|
-
case 0: return [4 /*yield*/, test_1.removeTestServerFolder(target.appLoc, target)];
|
|
334
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestServerFolder)(target.appLoc, target)];
|
|
319
335
|
case 1:
|
|
320
336
|
_a.sent();
|
|
321
|
-
return [4 /*yield*/, test_1.removeTestApp(__dirname, target.name)];
|
|
337
|
+
return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, target.name)];
|
|
322
338
|
case 2:
|
|
323
339
|
_a.sent();
|
|
324
340
|
return [2 /*return*/];
|
|
@@ -328,10 +344,10 @@ describe('sasjs request with SAS9', function () {
|
|
|
328
344
|
beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
329
345
|
return __generator(this, function (_a) {
|
|
330
346
|
switch (_a.label) {
|
|
331
|
-
case 0: return [4 /*yield*/, utils_1.createFile(path_1.default.join(process.projectDir, configPathRel), JSON.stringify(target.toJson(), null, 2))];
|
|
347
|
+
case 0: return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(process.projectDir, configPathRel), JSON.stringify(target.toJson(), null, 2))];
|
|
332
348
|
case 1:
|
|
333
349
|
_a.sent();
|
|
334
|
-
return [4 /*yield*/, utils_1.createFile(path_1.default.join(process.projectDir, dataPathRel), JSON.stringify(sampleDataJson, null, 2))];
|
|
350
|
+
return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(process.projectDir, dataPathRel), JSON.stringify(sampleDataJson, null, 2))];
|
|
335
351
|
case 2:
|
|
336
352
|
_a.sent();
|
|
337
353
|
return [2 /*return*/];
|
|
@@ -339,69 +355,77 @@ describe('sasjs request with SAS9', function () {
|
|
|
339
355
|
});
|
|
340
356
|
}); });
|
|
341
357
|
it("should execute service 'sendArr' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
342
|
-
var
|
|
343
|
-
return __generator(this, function (
|
|
344
|
-
switch (
|
|
345
|
-
case 0: return [4 /*yield*/, expect(request_1.runSasJob(target, false, "/Public/app/cli-tests/"
|
|
358
|
+
var _a, _b;
|
|
359
|
+
return __generator(this, function (_c) {
|
|
360
|
+
switch (_c.label) {
|
|
361
|
+
case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendArr"), dataPathRel)).toResolve()];
|
|
346
362
|
case 1:
|
|
347
|
-
|
|
348
|
-
|
|
363
|
+
_c.sent();
|
|
364
|
+
_a = expect;
|
|
365
|
+
return [4 /*yield*/, getOutputJson()];
|
|
349
366
|
case 2:
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
367
|
+
_a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
|
|
368
|
+
_b = expect;
|
|
369
|
+
return [4 /*yield*/, getOutputJson()];
|
|
370
|
+
case 3:
|
|
371
|
+
_b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
|
|
354
372
|
return [2 /*return*/];
|
|
355
373
|
}
|
|
356
374
|
});
|
|
357
375
|
}); });
|
|
358
376
|
it("should execute service 'sendObj' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
359
|
-
var
|
|
360
|
-
return __generator(this, function (
|
|
361
|
-
switch (
|
|
362
|
-
case 0: return [4 /*yield*/, expect(request_1.runSasJob(target, false, "/Public/app/cli-tests/"
|
|
377
|
+
var _a, _b;
|
|
378
|
+
return __generator(this, function (_c) {
|
|
379
|
+
switch (_c.label) {
|
|
380
|
+
case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendObj"), dataPathRel)).toResolve()];
|
|
363
381
|
case 1:
|
|
364
|
-
|
|
365
|
-
|
|
382
|
+
_c.sent();
|
|
383
|
+
_a = expect;
|
|
384
|
+
return [4 /*yield*/, getOutputJson()];
|
|
366
385
|
case 2:
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
386
|
+
_a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
|
|
387
|
+
_b = expect;
|
|
388
|
+
return [4 /*yield*/, getOutputJson()];
|
|
389
|
+
case 3:
|
|
390
|
+
_b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
|
|
371
391
|
return [2 /*return*/];
|
|
372
392
|
}
|
|
373
393
|
});
|
|
374
394
|
}); });
|
|
375
395
|
it("should execute service 'sendArr' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
376
|
-
var
|
|
377
|
-
return __generator(this, function (
|
|
378
|
-
switch (
|
|
379
|
-
case 0: return [4 /*yield*/, expect(request_1.runSasJob(target, false, 'services/runRequest/sendArr', dataPathRel)).toResolve()];
|
|
396
|
+
var _a, _b;
|
|
397
|
+
return __generator(this, function (_c) {
|
|
398
|
+
switch (_c.label) {
|
|
399
|
+
case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendArr', dataPathRel)).toResolve()];
|
|
380
400
|
case 1:
|
|
381
|
-
|
|
382
|
-
|
|
401
|
+
_c.sent();
|
|
402
|
+
_a = expect;
|
|
403
|
+
return [4 /*yield*/, getOutputJson()];
|
|
383
404
|
case 2:
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
405
|
+
_a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
|
|
406
|
+
_b = expect;
|
|
407
|
+
return [4 /*yield*/, getOutputJson()];
|
|
408
|
+
case 3:
|
|
409
|
+
_b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
|
|
388
410
|
return [2 /*return*/];
|
|
389
411
|
}
|
|
390
412
|
});
|
|
391
413
|
}); });
|
|
392
414
|
it("should execute service 'sendObj' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
393
|
-
var
|
|
394
|
-
return __generator(this, function (
|
|
395
|
-
switch (
|
|
396
|
-
case 0: return [4 /*yield*/, expect(request_1.runSasJob(target, false, 'services/runRequest/sendObj', dataPathRel)).toResolve()];
|
|
415
|
+
var _a, _b;
|
|
416
|
+
return __generator(this, function (_c) {
|
|
417
|
+
switch (_c.label) {
|
|
418
|
+
case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendObj', dataPathRel)).toResolve()];
|
|
397
419
|
case 1:
|
|
398
|
-
|
|
399
|
-
|
|
420
|
+
_c.sent();
|
|
421
|
+
_a = expect;
|
|
422
|
+
return [4 /*yield*/, getOutputJson()];
|
|
400
423
|
case 2:
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
424
|
+
_a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
|
|
425
|
+
_b = expect;
|
|
426
|
+
return [4 /*yield*/, getOutputJson()];
|
|
427
|
+
case 3:
|
|
428
|
+
_b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
|
|
405
429
|
return [2 /*return*/];
|
|
406
430
|
}
|
|
407
431
|
});
|
|
@@ -410,10 +434,10 @@ describe('sasjs request with SAS9', function () {
|
|
|
410
434
|
var rawData, output;
|
|
411
435
|
return __generator(this, function (_a) {
|
|
412
436
|
switch (_a.label) {
|
|
413
|
-
case 0: return [4 /*yield*/, expect(request_1.runSasJob(target, false, "/Public/app/cli-tests/"
|
|
437
|
+
case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, "/Public/app/cli-tests/".concat(target.name, "/services/runRequest/sendArr"), dataPathRel, undefined, undefined, undefined, undefined, './myoutput.json')).toResolve()];
|
|
414
438
|
case 1:
|
|
415
439
|
_a.sent();
|
|
416
|
-
return [4 /*yield*/, utils_1.readFile(process.projectDir
|
|
440
|
+
return [4 /*yield*/, (0, utils_1.readFile)(path_1.default.join(process.projectDir, 'myoutput.json'))];
|
|
417
441
|
case 2:
|
|
418
442
|
rawData = _a.sent();
|
|
419
443
|
output = JSON.parse(rawData);
|
|
@@ -428,13 +452,13 @@ describe('sasjs request with SAS9', function () {
|
|
|
428
452
|
return __generator(this, function (_a) {
|
|
429
453
|
switch (_a.label) {
|
|
430
454
|
case 0:
|
|
431
|
-
jobPath = utils_3.prefixAppLoc(target.appLoc,
|
|
432
|
-
log = getLogFilePath_1.getLogFilePath('./mylog.txt', jobPath || '');
|
|
433
|
-
return [4 /*yield*/, expect(request_1.runSasJob(target, false,
|
|
455
|
+
jobPath = (0, utils_3.prefixAppLoc)(target.appLoc, 'services/runRequest/err');
|
|
456
|
+
log = (0, getLogFilePath_1.getLogFilePath)('./mylog.txt', jobPath || '');
|
|
457
|
+
return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, jobPath, dataPathRel, undefined, undefined, log, jobPath)).toResolve()];
|
|
434
458
|
case 1:
|
|
435
459
|
_a.sent();
|
|
436
|
-
rawLogDataStats = fs_1.statSync(
|
|
437
|
-
rawDataStats = fs_1.statSync(process.projectDir
|
|
460
|
+
rawLogDataStats = (0, fs_1.statSync)(log);
|
|
461
|
+
rawDataStats = (0, fs_1.statSync)(path_1.default.join(process.projectDir, 'output.json'));
|
|
438
462
|
expect(rawLogDataStats.size).toBeGreaterThan(10);
|
|
439
463
|
expect(rawDataStats.size).toBeGreaterThan(10);
|
|
440
464
|
return [2 /*return*/];
|
|
@@ -446,13 +470,13 @@ describe('sasjs request with SAS9', function () {
|
|
|
446
470
|
return __generator(this, function (_a) {
|
|
447
471
|
switch (_a.label) {
|
|
448
472
|
case 0:
|
|
449
|
-
jobPath = utils_3.prefixAppLoc(target.appLoc,
|
|
450
|
-
log = getLogFilePath_1.getLogFilePath('', jobPath || '');
|
|
451
|
-
return [4 /*yield*/, expect(request_1.runSasJob(target, false,
|
|
473
|
+
jobPath = (0, utils_3.prefixAppLoc)(target.appLoc, 'services/runRequest/err');
|
|
474
|
+
log = (0, getLogFilePath_1.getLogFilePath)('', jobPath || '');
|
|
475
|
+
return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, jobPath, dataPathRel, undefined, undefined, log, jobPath)).toResolve()];
|
|
452
476
|
case 1:
|
|
453
477
|
_a.sent();
|
|
454
|
-
rawLogDataStats = fs_1.statSync(
|
|
455
|
-
rawDataStats = fs_1.statSync(process.projectDir
|
|
478
|
+
rawLogDataStats = (0, fs_1.statSync)(log);
|
|
479
|
+
rawDataStats = (0, fs_1.statSync)(path_1.default.join(process.projectDir, 'output.json'));
|
|
456
480
|
expect(rawLogDataStats.size).toBeGreaterThan(10);
|
|
457
481
|
expect(rawDataStats.size).toBeGreaterThan(10);
|
|
458
482
|
return [2 /*return*/];
|
|
@@ -461,8 +485,8 @@ describe('sasjs request with SAS9', function () {
|
|
|
461
485
|
}); });
|
|
462
486
|
});
|
|
463
487
|
describe("sasjs request with compute API", function () {
|
|
464
|
-
var appName = 'cli-tests-request-' + utils_2.generateTimestamp();
|
|
465
|
-
var target = test_1.generateTestTarget(appName, "/Public/app/cli-tests/"
|
|
488
|
+
var appName = 'cli-tests-request-' + (0, utils_2.generateTimestamp)();
|
|
489
|
+
var target = (0, test_1.generateTestTarget)(appName, "/Public/app/cli-tests/".concat(appName), {
|
|
466
490
|
serviceFolders: ['sasjs/runRequest'],
|
|
467
491
|
initProgram: '',
|
|
468
492
|
termProgram: '',
|
|
@@ -474,19 +498,19 @@ describe("sasjs request with compute API", function () {
|
|
|
474
498
|
beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
475
499
|
return __generator(this, function (_a) {
|
|
476
500
|
switch (_a.label) {
|
|
477
|
-
case 0: return [4 /*yield*/, test_1.createTestApp(__dirname, appName)];
|
|
501
|
+
case 0: return [4 /*yield*/, (0, test_1.createTestApp)(__dirname, appName)];
|
|
478
502
|
case 1:
|
|
479
503
|
_a.sent();
|
|
480
|
-
return [4 /*yield*/, config_1.getAuthConfig(target)];
|
|
504
|
+
return [4 /*yield*/, (0, config_1.getAuthConfig)(target)];
|
|
481
505
|
case 2:
|
|
482
506
|
authConfig = _a.sent();
|
|
483
|
-
return [4 /*yield*/, utils_1.copy(path_1.default.join(__dirname, 'runRequest'), path_1.default.join(process.projectDir, 'sasjs', 'runRequest'))];
|
|
507
|
+
return [4 /*yield*/, (0, utils_1.copy)(path_1.default.join(__dirname, 'runRequest'), path_1.default.join(process.projectDir, 'sasjs', 'runRequest'))];
|
|
484
508
|
case 3:
|
|
485
509
|
_a.sent();
|
|
486
|
-
return [4 /*yield*/, build_1.build(target)];
|
|
510
|
+
return [4 /*yield*/, (0, build_1.build)(target)];
|
|
487
511
|
case 4:
|
|
488
512
|
_a.sent();
|
|
489
|
-
return [4 /*yield*/, deploy_1.deploy(target, false)];
|
|
513
|
+
return [4 /*yield*/, (0, deploy_1.deploy)(target, false)];
|
|
490
514
|
case 5:
|
|
491
515
|
_a.sent();
|
|
492
516
|
return [2 /*return*/];
|
|
@@ -496,10 +520,10 @@ describe("sasjs request with compute API", function () {
|
|
|
496
520
|
afterAll(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
497
521
|
return __generator(this, function (_a) {
|
|
498
522
|
switch (_a.label) {
|
|
499
|
-
case 0: return [4 /*yield*/, test_1.removeTestServerFolder(target.appLoc, target)];
|
|
523
|
+
case 0: return [4 /*yield*/, (0, test_1.removeTestServerFolder)(target.appLoc, target)];
|
|
500
524
|
case 1:
|
|
501
525
|
_a.sent();
|
|
502
|
-
return [4 /*yield*/, test_1.removeTestApp(__dirname, target.name)];
|
|
526
|
+
return [4 /*yield*/, (0, test_1.removeTestApp)(__dirname, target.name)];
|
|
503
527
|
case 2:
|
|
504
528
|
_a.sent();
|
|
505
529
|
return [2 /*return*/];
|
|
@@ -509,10 +533,10 @@ describe("sasjs request with compute API", function () {
|
|
|
509
533
|
beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
510
534
|
return __generator(this, function (_a) {
|
|
511
535
|
switch (_a.label) {
|
|
512
|
-
case 0: return [4 /*yield*/, utils_1.createFile(path_1.default.join(process.projectDir, configPathRel), JSON.stringify(__assign(__assign({}, target.toJson()), { useComputeApi: true, contextName: utils_3.contextName }), null, 2))];
|
|
536
|
+
case 0: return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(process.projectDir, configPathRel), JSON.stringify(__assign(__assign({}, target.toJson()), { useComputeApi: true, contextName: utils_3.contextName }), null, 2))];
|
|
513
537
|
case 1:
|
|
514
538
|
_a.sent();
|
|
515
|
-
return [4 /*yield*/, utils_1.createFile(path_1.default.join(process.projectDir, dataPathRel), JSON.stringify(sampleDataJson, null, 2))];
|
|
539
|
+
return [4 /*yield*/, (0, utils_1.createFile)(path_1.default.join(process.projectDir, dataPathRel), JSON.stringify(sampleDataJson, null, 2))];
|
|
516
540
|
case 2:
|
|
517
541
|
_a.sent();
|
|
518
542
|
return [2 /*return*/];
|
|
@@ -520,69 +544,77 @@ describe("sasjs request with compute API", function () {
|
|
|
520
544
|
});
|
|
521
545
|
}); });
|
|
522
546
|
it("should execute service 'sendArr' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
523
|
-
var
|
|
524
|
-
return __generator(this, function (
|
|
525
|
-
switch (
|
|
526
|
-
case 0: return [4 /*yield*/, expect(request_1.runSasJob(target, false, "/Public/app/cli-tests/"
|
|
547
|
+
var _a, _b;
|
|
548
|
+
return __generator(this, function (_c) {
|
|
549
|
+
switch (_c.label) {
|
|
550
|
+
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()];
|
|
527
551
|
case 1:
|
|
528
|
-
|
|
529
|
-
|
|
552
|
+
_c.sent();
|
|
553
|
+
_a = expect;
|
|
554
|
+
return [4 /*yield*/, getOutputJson()];
|
|
530
555
|
case 2:
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
556
|
+
_a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
|
|
557
|
+
_b = expect;
|
|
558
|
+
return [4 /*yield*/, getOutputJson()];
|
|
559
|
+
case 3:
|
|
560
|
+
_b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
|
|
535
561
|
return [2 /*return*/];
|
|
536
562
|
}
|
|
537
563
|
});
|
|
538
564
|
}); });
|
|
539
565
|
it("should execute service 'sendObj' with absolute path", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
540
|
-
var
|
|
541
|
-
return __generator(this, function (
|
|
542
|
-
switch (
|
|
543
|
-
case 0: return [4 /*yield*/, expect(request_1.runSasJob(target, false, "/Public/app/cli-tests/"
|
|
566
|
+
var _a, _b;
|
|
567
|
+
return __generator(this, function (_c) {
|
|
568
|
+
switch (_c.label) {
|
|
569
|
+
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()];
|
|
544
570
|
case 1:
|
|
545
|
-
|
|
546
|
-
|
|
571
|
+
_c.sent();
|
|
572
|
+
_a = expect;
|
|
573
|
+
return [4 /*yield*/, getOutputJson()];
|
|
547
574
|
case 2:
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
575
|
+
_a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
|
|
576
|
+
_b = expect;
|
|
577
|
+
return [4 /*yield*/, getOutputJson()];
|
|
578
|
+
case 3:
|
|
579
|
+
_b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
|
|
552
580
|
return [2 /*return*/];
|
|
553
581
|
}
|
|
554
582
|
});
|
|
555
583
|
}); });
|
|
556
584
|
it("should execute service 'sendArr' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
557
|
-
var
|
|
558
|
-
return __generator(this, function (
|
|
559
|
-
switch (
|
|
560
|
-
case 0: return [4 /*yield*/, expect(request_1.runSasJob(target, false, 'services/runRequest/sendArr', dataPathRel, undefined, authConfig)).toResolve()];
|
|
585
|
+
var _a, _b;
|
|
586
|
+
return __generator(this, function (_c) {
|
|
587
|
+
switch (_c.label) {
|
|
588
|
+
case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendArr', dataPathRel, undefined, authConfig)).toResolve()];
|
|
561
589
|
case 1:
|
|
562
|
-
|
|
563
|
-
|
|
590
|
+
_c.sent();
|
|
591
|
+
_a = expect;
|
|
592
|
+
return [4 /*yield*/, getOutputJson()];
|
|
564
593
|
case 2:
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
594
|
+
_a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataArr.table1);
|
|
595
|
+
_b = expect;
|
|
596
|
+
return [4 /*yield*/, getOutputJson()];
|
|
597
|
+
case 3:
|
|
598
|
+
_b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataArr.table2);
|
|
569
599
|
return [2 /*return*/];
|
|
570
600
|
}
|
|
571
601
|
});
|
|
572
602
|
}); });
|
|
573
603
|
it("should execute service 'sendObj' with relative path", function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
574
|
-
var
|
|
575
|
-
return __generator(this, function (
|
|
576
|
-
switch (
|
|
577
|
-
case 0: return [4 /*yield*/, expect(request_1.runSasJob(target, false, 'services/runRequest/sendObj', dataPathRel, undefined, authConfig)).toResolve()];
|
|
604
|
+
var _a, _b;
|
|
605
|
+
return __generator(this, function (_c) {
|
|
606
|
+
switch (_c.label) {
|
|
607
|
+
case 0: return [4 /*yield*/, expect((0, request_1.runSasJob)(target, false, 'services/runRequest/sendObj', dataPathRel, undefined, authConfig)).toResolve()];
|
|
578
608
|
case 1:
|
|
579
|
-
|
|
580
|
-
|
|
609
|
+
_c.sent();
|
|
610
|
+
_a = expect;
|
|
611
|
+
return [4 /*yield*/, getOutputJson()];
|
|
581
612
|
case 2:
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
613
|
+
_a.apply(void 0, [(_c.sent()).table1]).toEqual(expectedDataObj.table1);
|
|
614
|
+
_b = expect;
|
|
615
|
+
return [4 /*yield*/, getOutputJson()];
|
|
616
|
+
case 3:
|
|
617
|
+
_b.apply(void 0, [(_c.sent()).table2]).toEqual(expectedDataObj.table2);
|
|
586
618
|
return [2 /*return*/];
|
|
587
619
|
}
|
|
588
620
|
});
|