@terascope/scripts 0.50.6 → 0.50.7
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../../../src/cmds/test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAOtE,aAAK,OAAO,GAAG;IACX,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,uBAAuB,EAAE,MAAM,CAAC;IAChC,2BAA2B,EAAE,MAAM,CAAC;IACpC,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uBAAuB,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAC;IACzB,cAAc,EAAE,OAAO,CAAA;CAC1B,CAAC;
|
|
1
|
+
{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../../../src/cmds/test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAOtE,aAAK,OAAO,GAAG;IACX,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,uBAAuB,EAAE,MAAM,CAAC;IAChC,2BAA2B,EAAE,MAAM,CAAC;IACpC,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uBAAuB,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAC;IACzB,cAAc,EAAE,OAAO,CAAA;CAC1B,CAAC;AAIF,QAAA,MAAM,GAAG,EAAE,aAAa,CAAC,gBAAgB,EAAE,OAAO,CAkJjD,CAAC;AA+DF,SAAS,GAAG,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/cmds/test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAoB;AAEpB,4CAAwD;AAExD,0CAAyD;AACzD,0DAA4C;AAC5C,kDAAmD;AACnD,wDAAkD;AAClD,0CAA+C;AAsB/C,MAAM,QAAQ,GAAG,YAAY,EAAE,CAAC;AAChC,MAAM,UAAU,GAAG,IAAA,6BAAsB,GAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/cmds/test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/helpers/test-runner/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/helpers/test-runner/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAkB3C,wBAAsB,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAY3F"}
|
|
@@ -1,27 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
4
|
};
|
|
@@ -31,10 +8,10 @@ const utils_1 = require("@terascope/utils");
|
|
|
31
8
|
const misc_1 = require("../misc");
|
|
32
9
|
const services_1 = require("./services");
|
|
33
10
|
const scripts_1 = require("../scripts");
|
|
34
|
-
const
|
|
11
|
+
const utils_2 = require("./utils");
|
|
35
12
|
const signale_1 = __importDefault(require("../signale"));
|
|
36
13
|
const packages_1 = require("../packages");
|
|
37
|
-
const
|
|
14
|
+
const utils_3 = require("../publish/utils");
|
|
38
15
|
const tracker_1 = require("./tracker");
|
|
39
16
|
const config_1 = require("../config");
|
|
40
17
|
const logger = (0, utils_1.debugLogger)('ts-scripts:cmd:test');
|
|
@@ -58,13 +35,13 @@ async function _runTests(pkgInfos, options, tracker) {
|
|
|
58
35
|
await runE2ETest(options, tracker);
|
|
59
36
|
return;
|
|
60
37
|
}
|
|
61
|
-
const filtered =
|
|
38
|
+
const filtered = (0, utils_2.filterBySuite)(pkgInfos, options);
|
|
62
39
|
if (!filtered.length) {
|
|
63
40
|
signale_1.default.warn('No tests found.');
|
|
64
41
|
return;
|
|
65
42
|
}
|
|
66
43
|
const availableSuites = (0, misc_1.getAvailableTestSuites)();
|
|
67
|
-
const grouped =
|
|
44
|
+
const grouped = (0, utils_2.groupBySuite)(filtered, availableSuites, options);
|
|
68
45
|
for (const [suite, pkgs] of Object.entries(grouped)) {
|
|
69
46
|
if (!pkgs.length || suite === 'e2e')
|
|
70
47
|
continue;
|
|
@@ -111,7 +88,7 @@ async function runTestSuite(suite, pkgInfos, options, tracker) {
|
|
|
111
88
|
else {
|
|
112
89
|
(0, misc_1.writeHeader)(`Running batch of ${pkgs.length} tests`, false);
|
|
113
90
|
}
|
|
114
|
-
const args =
|
|
91
|
+
const args = (0, utils_2.getArgs)(options);
|
|
115
92
|
args.projects = pkgs.map((pkgInfo) => {
|
|
116
93
|
if (pkgInfo.relativeDir.length) {
|
|
117
94
|
return pkgInfo.relativeDir;
|
|
@@ -135,7 +112,7 @@ async function runTestSuite(suite, pkgInfos, options, tracker) {
|
|
|
135
112
|
cleanupKeys.push(cleanupKey);
|
|
136
113
|
tracker.addCleanup(cleanupKey, async () => {
|
|
137
114
|
options.keepOpen = false;
|
|
138
|
-
await
|
|
115
|
+
await (0, utils_2.globalTeardown)(options, teardownPkgs);
|
|
139
116
|
});
|
|
140
117
|
if (options.bail || utils_1.isCI) {
|
|
141
118
|
signale_1.default.error('Bailing out of tests due to error');
|
|
@@ -144,7 +121,7 @@ async function runTestSuite(suite, pkgInfos, options, tracker) {
|
|
|
144
121
|
}
|
|
145
122
|
finally {
|
|
146
123
|
if (options.reportCoverage) {
|
|
147
|
-
await
|
|
124
|
+
await (0, utils_2.reportCoverage)(suite, chunkIndex);
|
|
148
125
|
}
|
|
149
126
|
}
|
|
150
127
|
}
|
|
@@ -173,7 +150,7 @@ async function runE2ETest(options, tracker) {
|
|
|
173
150
|
await (0, scripts_1.dockerTag)(devImage, e2eImage);
|
|
174
151
|
}
|
|
175
152
|
else {
|
|
176
|
-
const devImage = await (0,
|
|
153
|
+
const devImage = await (0, utils_3.buildDevDockerImage)();
|
|
177
154
|
await (0, scripts_1.dockerTag)(devImage, e2eImage);
|
|
178
155
|
}
|
|
179
156
|
}
|
|
@@ -193,7 +170,7 @@ async function runE2ETest(options, tracker) {
|
|
|
193
170
|
const env = printAndGetEnv(suite, options);
|
|
194
171
|
tracker.started++;
|
|
195
172
|
try {
|
|
196
|
-
await (0, scripts_1.runJest)(e2eDir,
|
|
173
|
+
await (0, scripts_1.runJest)(e2eDir, (0, utils_2.getArgs)(options), env, options.jestArgs, options.debug);
|
|
197
174
|
tracker.ended++;
|
|
198
175
|
}
|
|
199
176
|
catch (err) {
|
|
@@ -206,7 +183,7 @@ async function runE2ETest(options, tracker) {
|
|
|
206
183
|
return;
|
|
207
184
|
if (!options.keepOpen) {
|
|
208
185
|
try {
|
|
209
|
-
await
|
|
186
|
+
await (0, utils_2.logE2E)(e2eDir, tracker.hasErrors());
|
|
210
187
|
}
|
|
211
188
|
catch (err) {
|
|
212
189
|
signale_1.default.error(new utils_1.TSError(err, {
|
|
@@ -217,7 +194,7 @@ async function runE2ETest(options, tracker) {
|
|
|
217
194
|
if (tracker.hasErrors()) {
|
|
218
195
|
tracker.addCleanup('e2e:teardown', async () => {
|
|
219
196
|
options.keepOpen = false;
|
|
220
|
-
await
|
|
197
|
+
await (0, utils_2.globalTeardown)(options, [{
|
|
221
198
|
name: suite,
|
|
222
199
|
dir: e2eDir,
|
|
223
200
|
suite,
|
|
@@ -226,7 +203,7 @@ async function runE2ETest(options, tracker) {
|
|
|
226
203
|
}
|
|
227
204
|
}
|
|
228
205
|
function printAndGetEnv(suite, options) {
|
|
229
|
-
const env =
|
|
206
|
+
const env = (0, utils_2.getEnv)(options, suite);
|
|
230
207
|
if (options.debug || options.trace || utils_1.isCI) {
|
|
231
208
|
const envStr = Object
|
|
232
209
|
.entries(env)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/helpers/test-runner/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/helpers/test-runner/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@terascope/scripts",
|
|
3
3
|
"displayName": "Scripts",
|
|
4
|
-
"version": "0.50.
|
|
4
|
+
"version": "0.50.7",
|
|
5
5
|
"description": "A collection of terascope monorepo scripts",
|
|
6
6
|
"homepage": "https://github.com/terascope/teraslice/tree/master/packages/scripts#readme",
|
|
7
7
|
"bugs": {
|