@datadog/datadog-ci 1.7.2 → 1.8.0
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 +26 -0
- package/dist/commands/junit/__tests__/upload.test.js +12 -0
- package/dist/commands/junit/__tests__/upload.test.js.map +1 -1
- package/dist/commands/junit/api.js +1 -1
- package/dist/commands/junit/api.js.map +1 -1
- package/dist/commands/junit/interfaces.d.ts +1 -0
- package/dist/commands/junit/upload.js +2 -0
- package/dist/commands/junit/upload.js.map +1 -1
- package/dist/commands/synthetics/__tests__/api.test.js +5 -13
- package/dist/commands/synthetics/__tests__/api.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/cli.test.js +49 -211
- package/dist/commands/synthetics/__tests__/cli.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/fixtures.d.ts +10 -15
- package/dist/commands/synthetics/__tests__/fixtures.js +99 -56
- package/dist/commands/synthetics/__tests__/fixtures.js.map +1 -1
- package/dist/commands/synthetics/__tests__/reporters/default.test.js +21 -24
- package/dist/commands/synthetics/__tests__/reporters/default.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/reporters/junit.test.js +1 -2
- package/dist/commands/synthetics/__tests__/reporters/junit.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/run-test.test.js +5 -3
- package/dist/commands/synthetics/__tests__/run-test.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/utils.test.js +289 -225
- package/dist/commands/synthetics/__tests__/utils.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/websocket.test.js +2 -0
- package/dist/commands/synthetics/__tests__/websocket.test.js.map +1 -1
- package/dist/commands/synthetics/api.d.ts +3 -4
- package/dist/commands/synthetics/api.js +13 -3
- package/dist/commands/synthetics/api.js.map +1 -1
- package/dist/commands/synthetics/command.d.ts +1 -9
- package/dist/commands/synthetics/command.js +7 -66
- package/dist/commands/synthetics/command.js.map +1 -1
- package/dist/commands/synthetics/errors.d.ts +1 -1
- package/dist/commands/synthetics/errors.js +1 -1
- package/dist/commands/synthetics/errors.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +28 -31
- package/dist/commands/synthetics/interfaces.js +1 -7
- package/dist/commands/synthetics/interfaces.js.map +1 -1
- package/dist/commands/synthetics/reporters/default.d.ts +3 -3
- package/dist/commands/synthetics/reporters/default.js +35 -19
- package/dist/commands/synthetics/reporters/default.js.map +1 -1
- package/dist/commands/synthetics/reporters/junit.js +4 -5
- package/dist/commands/synthetics/reporters/junit.js.map +1 -1
- package/dist/commands/synthetics/run-test.d.ts +2 -3
- package/dist/commands/synthetics/run-test.js +6 -8
- package/dist/commands/synthetics/run-test.js.map +1 -1
- package/dist/commands/synthetics/utils.d.ts +19 -5
- package/dist/commands/synthetics/utils.js +118 -104
- package/dist/commands/synthetics/utils.js.map +1 -1
- package/package.json +2 -1
package/README.md
CHANGED
|
@@ -57,6 +57,32 @@ Then you can run `datadog-ci` commands normally:
|
|
|
57
57
|
datadog-ci version
|
|
58
58
|
```
|
|
59
59
|
|
|
60
|
+
### Container image (**experimental**)
|
|
61
|
+
|
|
62
|
+
In order to run `datadog-ci` from a container, you can use the following `Dockerfile:
|
|
63
|
+
|
|
64
|
+
```dockerfile
|
|
65
|
+
ARG VERSION
|
|
66
|
+
FROM ubuntu:20.04
|
|
67
|
+
|
|
68
|
+
ADD https://github.com/DataDog/datadog-ci/releases/download/$VERSION/datadog-ci_linux-x64 /usr/local/bin/datadog-ci
|
|
69
|
+
RUN chmod +x /usr/local/bin/datadog-ci
|
|
70
|
+
|
|
71
|
+
ENTRYPOINT ["/usr/local/bin/datadog-ci"]
|
|
72
|
+
```
|
|
73
|
+
|
|
74
|
+
To build and run it, the following commands can be used:
|
|
75
|
+
|
|
76
|
+
```sh
|
|
77
|
+
# Build the container
|
|
78
|
+
docker build -t datadog-ci:dev --build-arg VERSION=v1.7.2 .
|
|
79
|
+
|
|
80
|
+
# Run a command using the container
|
|
81
|
+
export DD_API_KEY=$(cat /secret/dd_api_key)
|
|
82
|
+
export DD_APP_KEY=$(cat /secret/dd_app_key)
|
|
83
|
+
docker run --rm -it --name datadog-ci -e DD_API_KEY -e DD_APP_KEY datadog-ci:dev synthetics run-tests -p pub-lic-id1
|
|
84
|
+
```
|
|
85
|
+
|
|
60
86
|
## Usage
|
|
61
87
|
|
|
62
88
|
```bash
|
|
@@ -153,6 +153,18 @@ describe('upload', () => {
|
|
|
153
153
|
key2: 'value2',
|
|
154
154
|
});
|
|
155
155
|
}));
|
|
156
|
+
test('should set hostname', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
157
|
+
const context = createMockContext();
|
|
158
|
+
const command = new upload_1.UploadJUnitXMLCommand();
|
|
159
|
+
const [firstFile, secondFile] = yield command['getMatchingJUnitXMLFiles'].call({
|
|
160
|
+
basePaths: ['./src/commands/junit/__tests__/fixtures'],
|
|
161
|
+
config: {},
|
|
162
|
+
context,
|
|
163
|
+
service: 'service',
|
|
164
|
+
});
|
|
165
|
+
expect(firstFile.hostname).toEqual(os_1.default.hostname());
|
|
166
|
+
expect(secondFile.hostname).toEqual(os_1.default.hostname());
|
|
167
|
+
}));
|
|
156
168
|
test('should parse tags argument', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
157
169
|
const context = createMockContext();
|
|
158
170
|
const command = new upload_1.UploadJUnitXMLCommand();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.test.js","sourceRoot":"","sources":["../../../../src/commands/junit/__tests__/upload.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upload.test.js","sourceRoot":"","sources":["../../../../src/commands/junit/__tests__/upload.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,7 @@ const uploadJUnitXML = (request) => (jUnitXML, write) => __awaiter(void 0, void
|
|
|
38
38
|
catch (e) {
|
|
39
39
|
fileName = 'default_file_name';
|
|
40
40
|
}
|
|
41
|
-
const spanTags = Object.assign(Object.assign({ service: jUnitXML.service }, jUnitXML.spanTags), { '_dd.cireport_version': '2' });
|
|
41
|
+
const spanTags = Object.assign(Object.assign({ service: jUnitXML.service }, jUnitXML.spanTags), { '_dd.cireport_version': '2', '_dd.hostname': jUnitXML.hostname });
|
|
42
42
|
if (jUnitXML.logsEnabled) {
|
|
43
43
|
spanTags['_dd.junitxml_logs'] = 'true';
|
|
44
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/junit/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,0DAAgC;AAChC,4CAAmB;AACnB,gDAAuB;AAEvB,+BAA+B;AAE/B,+CAAqD;AAErD,yCAAuC;AAEvC,6CAAuE;AAEvE,wEAAwE;AACxE,oEAAoE;AACpE,2BAA2B;AACpB,MAAM,eAAe,GAAG,CAAC,cAAsB,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAA;AAAxF,QAAA,eAAe,mBAAyE;AAErG,sLAAsL;AACtL,iHAAiH;AACjH,MAAM,aAAa,GAAG,QAAQ,CAAA;AAEvB,MAAM,cAAc,GAAG,CAAC,OAAkE,EAAE,EAAE,CAAC,CACpG,QAAiB,EACjB,KAAwB,EACxB,EAAE;IACF,MAAM,IAAI,GAAG,IAAI,mBAAQ,EAAE,CAAA;IAC3B,KAAK,CAAC,uBAAY,CAAC,QAAQ,CAAC,CAAC,CAAA;IAE7B,IAAI,QAAQ,CAAA;IACZ,IAAI;QACF,QAAQ,GAAG,cAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;KAC7C;IAAC,OAAO,CAAC,EAAE;QACV,QAAQ,GAAG,mBAAmB,CAAA;KAC/B;IAED,MAAM,QAAQ,iCACZ,OAAO,EAAE,QAAQ,CAAC,OAAO,IACtB,QAAQ,CAAC,QAAQ,KACpB,sBAAsB,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/junit/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,0DAAgC;AAChC,4CAAmB;AACnB,gDAAuB;AAEvB,+BAA+B;AAE/B,+CAAqD;AAErD,yCAAuC;AAEvC,6CAAuE;AAEvE,wEAAwE;AACxE,oEAAoE;AACpE,2BAA2B;AACpB,MAAM,eAAe,GAAG,CAAC,cAAsB,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAA;AAAxF,QAAA,eAAe,mBAAyE;AAErG,sLAAsL;AACtL,iHAAiH;AACjH,MAAM,aAAa,GAAG,QAAQ,CAAA;AAEvB,MAAM,cAAc,GAAG,CAAC,OAAkE,EAAE,EAAE,CAAC,CACpG,QAAiB,EACjB,KAAwB,EACxB,EAAE;IACF,MAAM,IAAI,GAAG,IAAI,mBAAQ,EAAE,CAAA;IAC3B,KAAK,CAAC,uBAAY,CAAC,QAAQ,CAAC,CAAC,CAAA;IAE7B,IAAI,QAAQ,CAAA;IACZ,IAAI;QACF,QAAQ,GAAG,cAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;KAC7C;IAAC,OAAO,CAAC,EAAE;QACV,QAAQ,GAAG,mBAAmB,CAAA;KAC/B;IAED,MAAM,QAAQ,iCACZ,OAAO,EAAE,QAAQ,CAAC,OAAO,IACtB,QAAQ,CAAC,QAAQ,KACpB,sBAAsB,EAAE,GAAG,EAC3B,cAAc,EAAE,QAAQ,CAAC,QAAQ,GAClC,CAAA;IAED,IAAI,QAAQ,CAAC,WAAW,EAAE;QACxB,QAAQ,CAAC,mBAAmB,CAAC,GAAG,MAAM,CAAA;KACvC;IAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAC,QAAQ,EAAE,YAAY,EAAC,CAAC,CAAA;IAExE,IAAI,cAAc,GAAG,GAAG,QAAQ,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,cAAO,CAAC,EAAE,CAAA;IAE3E,IAAI,QAAQ,CAAC,sBAAe,CAAC,EAAE;QAC7B,cAAc,GAAG,GAAG,cAAc,IAAI,QAAQ,CAAC,sBAAe,CAAC,EAAE,CAAA;KAClE;IACD,IAAI,QAAQ,CAAC,iBAAU,CAAC,EAAE;QACxB,cAAc,GAAG,GAAG,cAAc,IAAI,QAAQ,CAAC,iBAAU,CAAC,EAAE,CAAA;KAC7D;IAED,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,YAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,iBAAU,EAAE,CAAC,EAAE;QAC7F,QAAQ,EAAE,GAAG,uBAAe,CAAC,cAAc,CAAC,SAAS;KACtD,CAAC,CAAA;IAEF,OAAO,OAAO,CAAC;QACb,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;QAC1B,aAAa;QACb,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,iBAAiB;KACvB,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AA/CY,QAAA,cAAc,kBA+C1B;AAEM,MAAM,cAAc,GAAG,CAAC,aAAqB,EAAE,MAAc,EAAE,EAAE;IACtE,MAAM,aAAa,GAAG,yBAAiB,CAAC,EAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAC,CAAC,CAAA;IAEzE,OAAO;QACL,cAAc,EAAE,sBAAc,CAAC,aAAa,CAAC;KAC9C,CAAA;AACH,CAAC,CAAA;AANY,QAAA,cAAc,kBAM1B"}
|
|
@@ -18,6 +18,7 @@ const clipanion_1 = require("clipanion");
|
|
|
18
18
|
const fast_xml_parser_1 = __importDefault(require("fast-xml-parser"));
|
|
19
19
|
const fs_1 = __importDefault(require("fs"));
|
|
20
20
|
const glob_1 = __importDefault(require("glob"));
|
|
21
|
+
const os_1 = __importDefault(require("os"));
|
|
21
22
|
const path_1 = __importDefault(require("path"));
|
|
22
23
|
const tiny_async_pool_1 = __importDefault(require("tiny-async-pool"));
|
|
23
24
|
const api_1 = require("./api");
|
|
@@ -119,6 +120,7 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
119
120
|
return true;
|
|
120
121
|
});
|
|
121
122
|
return validUniqueFiles.map((jUnitXMLFilePath) => ({
|
|
123
|
+
hostname: os_1.default.hostname(),
|
|
122
124
|
logsEnabled: this.logs,
|
|
123
125
|
service: this.service,
|
|
124
126
|
spanTags,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/junit/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,yCAAiC;AACjC,sEAAuC;AACvC,4CAAmB;AACnB,gDAAuB;AACvB,gDAAuB;AACvB,sEAAuC;AAEvC,+BAAoC;AAEpC,yCAOmB;AACnB,mCAAwC;AAExC,yCAA8C;AAC9C,2CAAgD;AAChD,+CAAgD;AAChD,6CAA4C;AAC5C,uEAAkE;AAClE,+CAA6C;AAE7C,MAAM,oBAAoB,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;AAEvC,MAAM,WAAW,GAAG,CAAC,WAAmB,EAAE,EAAE;IAC1C,MAAM,oBAAoB,GAAG,MAAM,CAAC,YAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAA;IACjE,MAAM,gBAAgB,GAAG,yBAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAA;IACjE,IAAI,gBAAgB,KAAK,IAAI,EAAE;QAC7B,OAAO,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAA;KAChC;IACD,MAAM,WAAW,GAAG,yBAAS,CAAC,KAAK,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAA;IACjE,IAAI,CAAC,WAAW,CAAC,UAAU,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE;QACrD,OAAO,wDAAwD,CAAA;KAChE;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAED,MAAa,qBAAsB,SAAQ,mBAAO;IAAlD;;QA6BU,WAAM,GAAG;YACf,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU;YAC7D,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM;YACvB,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;SAChC,CAAA;QACO,WAAM,GAAG,KAAK,CAAA;QAEd,SAAI,GAAG,KAAK,CAAA;QACZ,mBAAc,GAAG,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/junit/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,6 +32,7 @@ describe('dd-api', () => {
|
|
|
32
32
|
region: 'fake-region',
|
|
33
33
|
};
|
|
34
34
|
const RESULT_ID = '123';
|
|
35
|
+
const BATCH_ID = 'bid';
|
|
35
36
|
const POLL_RESULTS = {
|
|
36
37
|
results: [
|
|
37
38
|
{
|
|
@@ -44,15 +45,8 @@ describe('dd-api', () => {
|
|
|
44
45
|
};
|
|
45
46
|
const TRIGGERED_TEST_ID = 'fakeId';
|
|
46
47
|
const TRIGGER_RESULTS = {
|
|
48
|
+
batch_id: BATCH_ID,
|
|
47
49
|
locations: [LOCATION],
|
|
48
|
-
results: [
|
|
49
|
-
{
|
|
50
|
-
device: 'laptop_large',
|
|
51
|
-
location: 42,
|
|
52
|
-
public_id: TRIGGERED_TEST_ID,
|
|
53
|
-
result_id: RESULT_ID,
|
|
54
|
-
},
|
|
55
|
-
],
|
|
56
50
|
};
|
|
57
51
|
const PRESIGNED_URL_PAYLOAD = {
|
|
58
52
|
url: 'wss://presigned.url',
|
|
@@ -60,8 +54,7 @@ describe('dd-api', () => {
|
|
|
60
54
|
test('should get results from api', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
61
55
|
jest.spyOn(axios_1.default, 'create').mockImplementation((() => () => ({ data: POLL_RESULTS })));
|
|
62
56
|
const api = api_1.apiConstructor(apiConfiguration);
|
|
63
|
-
const
|
|
64
|
-
const { results } = yield pollResults([RESULT_ID]);
|
|
57
|
+
const results = yield api.pollResults([RESULT_ID]);
|
|
65
58
|
expect(results[0].resultID).toBe(RESULT_ID);
|
|
66
59
|
}));
|
|
67
60
|
test('should trigger tests using api', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -69,9 +62,8 @@ describe('dd-api', () => {
|
|
|
69
62
|
const api = api_1.apiConstructor(apiConfiguration);
|
|
70
63
|
const { triggerTests } = api;
|
|
71
64
|
const tests = [{ public_id: TRIGGERED_TEST_ID, executionRule: interfaces_1.ExecutionRule.BLOCKING }];
|
|
72
|
-
const {
|
|
73
|
-
expect(
|
|
74
|
-
expect(results[0].result_id).toBe(RESULT_ID);
|
|
65
|
+
const { batch_id: batchId } = yield triggerTests({ tests });
|
|
66
|
+
expect(batchId).toBe(BATCH_ID);
|
|
75
67
|
}));
|
|
76
68
|
test('should retry request that failed with code 5xx', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
77
69
|
const serverError = new Error('Server Error');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.test.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/__tests__/api.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAAiE;AAIjE,gCAAqC;AACrC,8CAA6G;AAE7G,yCAAsG;AAEtG,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACtB,MAAM,gBAAgB,GAAqB;QACzC,MAAM,EAAE,KAAK;QACb,MAAM,EAAE,KAAK;QACb,aAAa,EAAE,YAAY;QAC3B,OAAO,EAAE,MAAM;QACf,SAAS,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAuB;KACpD,CAAA;IACD,MAAM,QAAQ,GAAG;QACf,YAAY,EAAE,eAAe;QAC7B,EAAE,EAAE,EAAE;QACN,SAAS,EAAE,IAAI;QACf,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE,aAAa;KACtB,CAAA;IACD,MAAM,SAAS,GAAG,KAAK,CAAA;IACvB,MAAM,YAAY,GAA4B;QAC5C,OAAO,EAAE;YACP;gBACE,KAAK,EAAE,qBAAU,CAAC,aAAa,CAAC;gBAChC,MAAM,EAAG,EAA8B;gBACvC,QAAQ,EAAE,SAAS;gBACnB,SAAS,EAAE,CAAC;aACb;SACF;KACF,CAAA;IACD,MAAM,iBAAiB,GAAG,QAAQ,CAAA;IAClC,MAAM,eAAe,GAAY;QAC/B,
|
|
1
|
+
{"version":3,"file":"api.test.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/__tests__/api.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,15 +27,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
27
27
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
28
28
|
});
|
|
29
29
|
};
|
|
30
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
31
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
32
|
-
};
|
|
33
30
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
34
31
|
const advanced_1 = require("clipanion/lib/advanced");
|
|
35
|
-
const deep_extend_1 = __importDefault(require("deep-extend"));
|
|
36
32
|
const ciUtils = __importStar(require("../../../helpers/utils"));
|
|
37
33
|
const command_1 = require("../command");
|
|
38
|
-
const interfaces_1 = require("../interfaces");
|
|
39
34
|
const runTests = __importStar(require("../run-test"));
|
|
40
35
|
const utils = __importStar(require("../utils"));
|
|
41
36
|
const fixtures_1 = require("./fixtures");
|
|
@@ -71,48 +66,6 @@ describe('run-test', () => {
|
|
|
71
66
|
jest.spyOn(ciUtils, 'getConfig').mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () { return ({}); }));
|
|
72
67
|
process.env = {};
|
|
73
68
|
});
|
|
74
|
-
describe('getAppBaseURL', () => {
|
|
75
|
-
test('should default to datadog us', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
76
|
-
process.env = {};
|
|
77
|
-
const command = new command_1.RunTestCommand();
|
|
78
|
-
expect(command['getAppBaseURL']()).toBe('https://app.datadoghq.com/');
|
|
79
|
-
}));
|
|
80
|
-
test('subdomain should be overridable', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
81
|
-
process.env = { DATADOG_SUBDOMAIN: 'custom' };
|
|
82
|
-
const command = new command_1.RunTestCommand();
|
|
83
|
-
yield command['resolveConfig']();
|
|
84
|
-
expect(command['getAppBaseURL']()).toBe('https://custom.datadoghq.com/');
|
|
85
|
-
}));
|
|
86
|
-
test('should override subdomain and site', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
87
|
-
process.env = {
|
|
88
|
-
DATADOG_SITE: 'datadoghq.eu',
|
|
89
|
-
DATADOG_SUBDOMAIN: 'custom',
|
|
90
|
-
};
|
|
91
|
-
const command = new command_1.RunTestCommand();
|
|
92
|
-
yield command['resolveConfig']();
|
|
93
|
-
expect(command['getAppBaseURL']()).toBe('https://custom.datadoghq.eu/');
|
|
94
|
-
}));
|
|
95
|
-
});
|
|
96
|
-
describe('sortResultsByOutcome', () => {
|
|
97
|
-
const test1 = fixtures_1.getApiTest('test1');
|
|
98
|
-
const test2 = deep_extend_1.default(fixtures_1.getApiTest('test2'), { options: { ci: { executionRule: interfaces_1.ExecutionRule.BLOCKING } } });
|
|
99
|
-
const test3 = deep_extend_1.default(fixtures_1.getApiTest('test3'), { options: { ci: { executionRule: interfaces_1.ExecutionRule.NON_BLOCKING } } });
|
|
100
|
-
const test4 = deep_extend_1.default(fixtures_1.getApiTest('test4'), { options: { ci: { executionRule: interfaces_1.ExecutionRule.BLOCKING } } });
|
|
101
|
-
const test5 = deep_extend_1.default(fixtures_1.getApiTest('test5'), { options: { ci: { executionRule: interfaces_1.ExecutionRule.NON_BLOCKING } } });
|
|
102
|
-
const results = [
|
|
103
|
-
deep_extend_1.default(fixtures_1.getApiResult('1', test1), { passed: true }),
|
|
104
|
-
deep_extend_1.default(fixtures_1.getApiResult('2', test2), { passed: true }),
|
|
105
|
-
deep_extend_1.default(fixtures_1.getApiResult('3', test3), { passed: true }),
|
|
106
|
-
deep_extend_1.default(fixtures_1.getApiResult('4', test4), { passed: false }),
|
|
107
|
-
deep_extend_1.default(fixtures_1.getApiResult('5', test5), { passed: false }),
|
|
108
|
-
];
|
|
109
|
-
test('should sort tests with success, non_blocking failures then failures', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
110
|
-
const command = new command_1.RunTestCommand();
|
|
111
|
-
const sortedResults = [...results];
|
|
112
|
-
sortedResults.sort(command['sortResultsByOutcome']());
|
|
113
|
-
expect(sortedResults.map((r) => r.resultId)).toStrictEqual(['3', '1', '2', '5', '4']);
|
|
114
|
-
}));
|
|
115
|
-
});
|
|
116
69
|
describe('resolveConfig', () => {
|
|
117
70
|
beforeEach(() => {
|
|
118
71
|
process.env = {};
|
|
@@ -128,7 +81,7 @@ describe('run-test', () => {
|
|
|
128
81
|
process.env = overrideEnv;
|
|
129
82
|
const command = new command_1.RunTestCommand();
|
|
130
83
|
yield command['resolveConfig']();
|
|
131
|
-
expect(command['config']).toEqual(Object.assign(Object.assign({}, command_1.DEFAULT_COMMAND_CONFIG), { apiKey: overrideEnv.DATADOG_API_KEY, appKey: overrideEnv.DATADOG_APP_KEY, datadogSite: overrideEnv.DATADOG_SITE, subdomain: overrideEnv.DATADOG_SUBDOMAIN }));
|
|
84
|
+
expect(command['config']).toEqual(Object.assign(Object.assign({}, command_1.DEFAULT_COMMAND_CONFIG), { apiKey: overrideEnv.DATADOG_API_KEY, appKey: overrideEnv.DATADOG_APP_KEY, datadogSite: overrideEnv.DATADOG_SITE, global: { pollingTimeout: command_1.DEFAULT_POLLING_TIMEOUT }, subdomain: overrideEnv.DATADOG_SUBDOMAIN }));
|
|
132
85
|
}));
|
|
133
86
|
test('override from config file', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
134
87
|
const overrideConfigFile = {
|
|
@@ -139,7 +92,7 @@ describe('run-test', () => {
|
|
|
139
92
|
failOnCriticalErrors: true,
|
|
140
93
|
failOnTimeout: false,
|
|
141
94
|
files: ['my-new-file'],
|
|
142
|
-
global: { locations: [] },
|
|
95
|
+
global: { locations: [], pollingTimeout: 2 },
|
|
143
96
|
locations: [],
|
|
144
97
|
pollingTimeout: 1,
|
|
145
98
|
proxy: { protocol: 'https' },
|
|
@@ -180,7 +133,7 @@ describe('run-test', () => {
|
|
|
180
133
|
command['tunnel'] = overrideCLI.tunnel;
|
|
181
134
|
command['testSearchQuery'] = overrideCLI.testSearchQuery;
|
|
182
135
|
yield command['resolveConfig']();
|
|
183
|
-
expect(command['config']).toEqual(Object.assign(Object.assign({}, command_1.DEFAULT_COMMAND_CONFIG), { apiKey: 'fake_api_key', appKey: 'fake_app_key', configPath: 'fake-datadog-ci.json', datadogSite: 'datadoghq.eu', failOnCriticalErrors: true, failOnTimeout: false, files: ['new-file'], publicIds: ['ran-dom-id'], subdomain: 'new-sub-domain', testSearchQuery: 'a-search-query', tunnel: true }));
|
|
136
|
+
expect(command['config']).toEqual(Object.assign(Object.assign({}, command_1.DEFAULT_COMMAND_CONFIG), { apiKey: 'fake_api_key', appKey: 'fake_app_key', configPath: 'fake-datadog-ci.json', datadogSite: 'datadoghq.eu', failOnCriticalErrors: true, failOnTimeout: false, files: ['new-file'], global: { pollingTimeout: command_1.DEFAULT_POLLING_TIMEOUT }, publicIds: ['ran-dom-id'], subdomain: 'new-sub-domain', testSearchQuery: 'a-search-query', tunnel: true }));
|
|
184
137
|
}));
|
|
185
138
|
test('override from config file < ENV < CLI', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
186
139
|
jest.spyOn(ciUtils, 'getConfig').mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -197,7 +150,18 @@ describe('run-test', () => {
|
|
|
197
150
|
const command = new command_1.RunTestCommand();
|
|
198
151
|
command['apiKey'] = 'api_key_cli';
|
|
199
152
|
yield command['resolveConfig']();
|
|
200
|
-
expect(command['config']).toEqual(Object.assign(Object.assign({}, command_1.DEFAULT_COMMAND_CONFIG), { apiKey: 'api_key_cli', appKey: 'app_key_env', datadogSite: 'datadog.config.file' }));
|
|
153
|
+
expect(command['config']).toEqual(Object.assign(Object.assign({}, command_1.DEFAULT_COMMAND_CONFIG), { apiKey: 'api_key_cli', appKey: 'app_key_env', datadogSite: 'datadog.config.file', global: { pollingTimeout: command_1.DEFAULT_POLLING_TIMEOUT } }));
|
|
154
|
+
}));
|
|
155
|
+
test('pass command pollingTimeout as global override if undefined', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
156
|
+
jest.spyOn(ciUtils, 'getConfig').mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
157
|
+
return ({
|
|
158
|
+
global: { followRedirects: false },
|
|
159
|
+
pollingTimeout: 333,
|
|
160
|
+
});
|
|
161
|
+
}));
|
|
162
|
+
const command = new command_1.RunTestCommand();
|
|
163
|
+
yield command['resolveConfig']();
|
|
164
|
+
expect(command['config']).toEqual(Object.assign(Object.assign({}, command_1.DEFAULT_COMMAND_CONFIG), { global: { followRedirects: false, pollingTimeout: 333 }, pollingTimeout: 333 }));
|
|
201
165
|
}));
|
|
202
166
|
test('override locations with ENV variable', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
203
167
|
const conf = {
|
|
@@ -221,7 +185,14 @@ describe('run-test', () => {
|
|
|
221
185
|
jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);
|
|
222
186
|
expect(yield command.execute()).toBe(0);
|
|
223
187
|
expect(triggerTests).toHaveBeenCalledWith(expect.objectContaining({
|
|
224
|
-
tests: [
|
|
188
|
+
tests: [
|
|
189
|
+
{
|
|
190
|
+
executionRule: 'blocking',
|
|
191
|
+
locations: ['aws:us-east-2'],
|
|
192
|
+
pollingTimeout: command_1.DEFAULT_POLLING_TIMEOUT,
|
|
193
|
+
public_id: 'publicId',
|
|
194
|
+
},
|
|
195
|
+
],
|
|
225
196
|
}));
|
|
226
197
|
// Env > global
|
|
227
198
|
process.env = {
|
|
@@ -230,7 +201,14 @@ describe('run-test', () => {
|
|
|
230
201
|
expect(yield command.execute()).toBe(0);
|
|
231
202
|
expect(triggerTests).toHaveBeenCalledTimes(2);
|
|
232
203
|
expect(triggerTests).toHaveBeenNthCalledWith(2, expect.objectContaining({
|
|
233
|
-
tests: [
|
|
204
|
+
tests: [
|
|
205
|
+
{
|
|
206
|
+
executionRule: 'blocking',
|
|
207
|
+
locations: ['aws:us-east-3'],
|
|
208
|
+
pollingTimeout: command_1.DEFAULT_POLLING_TIMEOUT,
|
|
209
|
+
public_id: 'publicId',
|
|
210
|
+
},
|
|
211
|
+
],
|
|
234
212
|
}));
|
|
235
213
|
process.env = {
|
|
236
214
|
DATADOG_SYNTHETICS_LOCATIONS: 'aws:us-east-3;aws:us-east-4',
|
|
@@ -238,7 +216,14 @@ describe('run-test', () => {
|
|
|
238
216
|
expect(yield command.execute()).toBe(0);
|
|
239
217
|
expect(triggerTests).toHaveBeenCalledTimes(3);
|
|
240
218
|
expect(triggerTests).toHaveBeenNthCalledWith(3, expect.objectContaining({
|
|
241
|
-
tests: [
|
|
219
|
+
tests: [
|
|
220
|
+
{
|
|
221
|
+
executionRule: 'blocking',
|
|
222
|
+
locations: ['aws:us-east-3', 'aws:us-east-4'],
|
|
223
|
+
pollingTimeout: command_1.DEFAULT_POLLING_TIMEOUT,
|
|
224
|
+
public_id: 'publicId',
|
|
225
|
+
},
|
|
226
|
+
],
|
|
242
227
|
}));
|
|
243
228
|
// Test > env
|
|
244
229
|
const confWithLocation = {
|
|
@@ -247,7 +232,14 @@ describe('run-test', () => {
|
|
|
247
232
|
jest.spyOn(utils, 'getSuites').mockImplementation((() => [confWithLocation]));
|
|
248
233
|
expect(yield command.execute()).toBe(0);
|
|
249
234
|
expect(triggerTests).toHaveBeenCalledWith(expect.objectContaining({
|
|
250
|
-
tests: [
|
|
235
|
+
tests: [
|
|
236
|
+
{
|
|
237
|
+
executionRule: 'blocking',
|
|
238
|
+
locations: ['aws:us-east-1'],
|
|
239
|
+
pollingTimeout: command_1.DEFAULT_POLLING_TIMEOUT,
|
|
240
|
+
public_id: 'publicId',
|
|
241
|
+
},
|
|
242
|
+
],
|
|
251
243
|
}));
|
|
252
244
|
}));
|
|
253
245
|
});
|
|
@@ -267,20 +259,6 @@ describe('run-test', () => {
|
|
|
267
259
|
expect(yield command.execute()).toBe(0);
|
|
268
260
|
expect(apiHelper.getTest).toHaveBeenCalledTimes(1);
|
|
269
261
|
}));
|
|
270
|
-
test('`NO_RESULTS_TO_POLL` never exit with 1', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
271
|
-
const command = new command_1.RunTestCommand();
|
|
272
|
-
command.context = { stdout: { write: jest.fn() } };
|
|
273
|
-
command['config'].failOnCriticalErrors = true;
|
|
274
|
-
const apiHelper = {
|
|
275
|
-
getTest: () => fixtures_1.getApiTest('123-456-789'),
|
|
276
|
-
triggerTests: jest.fn(() => ({})),
|
|
277
|
-
};
|
|
278
|
-
jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);
|
|
279
|
-
jest.spyOn(ciUtils, 'parseConfigFile').mockImplementation((config, _) => __awaiter(void 0, void 0, void 0, function* () { return config; }));
|
|
280
|
-
jest.spyOn(utils, 'getSuites').mockImplementation((() => [fixtures_1.getTestSuite()]));
|
|
281
|
-
expect(yield command.execute()).toBe(0);
|
|
282
|
-
expect(apiHelper.triggerTests).toHaveBeenCalledTimes(1);
|
|
283
|
-
}));
|
|
284
262
|
describe.each([false, true])('%s', (failOnCriticalErrors) => {
|
|
285
263
|
const cases = [['HTTP 4xx error', 403], ['HTTP 5xx error', 502], ['Unknown error']];
|
|
286
264
|
const expectedExit = failOnCriticalErrors ? 1 : 0;
|
|
@@ -336,11 +314,12 @@ describe('run-test', () => {
|
|
|
336
314
|
command.context = { stdout: { write: jest.fn() } };
|
|
337
315
|
command['config'].failOnCriticalErrors = failOnCriticalErrors;
|
|
338
316
|
const apiHelper = {
|
|
317
|
+
getBatch: () => ({ results: [], status: 'success' }),
|
|
339
318
|
getTest: () => fixtures_1.getApiTest('123-456-789'),
|
|
340
319
|
pollResults: jest.fn(() => {
|
|
341
320
|
throw errorCode ? getAxiosHttpError(errorCode, 'Error') : new Error('Unknown error');
|
|
342
321
|
}),
|
|
343
|
-
triggerTests: () =>
|
|
322
|
+
triggerTests: () => fixtures_1.mockTestTriggerResponse,
|
|
344
323
|
};
|
|
345
324
|
jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);
|
|
346
325
|
jest.spyOn(ciUtils, 'parseConfigFile').mockImplementation((config, __) => __awaiter(void 0, void 0, void 0, function* () { return config; }));
|
|
@@ -351,146 +330,5 @@ describe('run-test', () => {
|
|
|
351
330
|
});
|
|
352
331
|
});
|
|
353
332
|
});
|
|
354
|
-
describe('Render results', () => {
|
|
355
|
-
const emptySummary = utils.createSummary();
|
|
356
|
-
const test1 = {
|
|
357
|
-
configOverride: { executionRule: interfaces_1.ExecutionRule.BLOCKING, startUrl: 'foo' },
|
|
358
|
-
publicId: 'aaa-aaa-aaa',
|
|
359
|
-
resultPassed: true,
|
|
360
|
-
};
|
|
361
|
-
const test1Timeout = Object.assign(Object.assign({}, test1), { resultError: 'Timeout', resultPassed: false });
|
|
362
|
-
const test1CriticalError = Object.assign(Object.assign({}, test1), { resultIsUnhealthy: true, resultPassed: false });
|
|
363
|
-
const test1FailedNonBlocking = Object.assign(Object.assign({}, test1), { configOverride: Object.assign(Object.assign({}, test1.configOverride), { executionRule: interfaces_1.ExecutionRule.NON_BLOCKING, startUrl: 'bar' }), resultPassed: false });
|
|
364
|
-
const test1Failed = Object.assign(Object.assign({}, test1), { configOverride: Object.assign(Object.assign({}, test1.configOverride), { executionRule: interfaces_1.ExecutionRule.BLOCKING, startUrl: 'baz' }), resultPassed: false });
|
|
365
|
-
const test1NonBlocking = Object.assign(Object.assign({}, test1), { executionRule: interfaces_1.ExecutionRule.NON_BLOCKING });
|
|
366
|
-
const test1NonBlockingFailedNonBlocking = Object.assign(Object.assign({}, test1FailedNonBlocking), { executionRule: interfaces_1.ExecutionRule.NON_BLOCKING });
|
|
367
|
-
const test1NonBlockingFailed = Object.assign(Object.assign({}, test1Failed), { executionRule: interfaces_1.ExecutionRule.NON_BLOCKING });
|
|
368
|
-
const test2Failed = {
|
|
369
|
-
configOverride: { executionRule: interfaces_1.ExecutionRule.BLOCKING, startUrl: 'bar' },
|
|
370
|
-
publicId: 'bbb-bbb-bbb',
|
|
371
|
-
resultPassed: false,
|
|
372
|
-
};
|
|
373
|
-
const test3 = {
|
|
374
|
-
configOverride: { executionRule: interfaces_1.ExecutionRule.BLOCKING, startUrl: 'baz' },
|
|
375
|
-
publicId: 'ccc-ccc-ccc',
|
|
376
|
-
resultPassed: true,
|
|
377
|
-
};
|
|
378
|
-
const cases = [
|
|
379
|
-
{
|
|
380
|
-
description: '1 API test with 1 config override, 1 result (passed)',
|
|
381
|
-
expected: {
|
|
382
|
-
exitCode: 0,
|
|
383
|
-
summary: Object.assign(Object.assign({}, emptySummary), { passed: 1 }),
|
|
384
|
-
},
|
|
385
|
-
failOnCriticalErrors: false,
|
|
386
|
-
failOnTimeout: false,
|
|
387
|
-
results: new fixtures_1.RenderResultsHelper().getResults([test1]),
|
|
388
|
-
summary: Object.assign({}, emptySummary),
|
|
389
|
-
},
|
|
390
|
-
{
|
|
391
|
-
description: '1 API test with 1 config override, 1 result (failed timeout), no fail on timeout, no fail on critical errors',
|
|
392
|
-
expected: {
|
|
393
|
-
exitCode: 0,
|
|
394
|
-
summary: Object.assign(Object.assign({}, emptySummary), { passed: 1, timedOut: 1 }),
|
|
395
|
-
},
|
|
396
|
-
failOnCriticalErrors: false,
|
|
397
|
-
failOnTimeout: false,
|
|
398
|
-
results: new fixtures_1.RenderResultsHelper().getResults([test1Timeout]),
|
|
399
|
-
summary: Object.assign({}, emptySummary),
|
|
400
|
-
},
|
|
401
|
-
{
|
|
402
|
-
description: '1 API test with 1 config override, 1 result (failed timeout), fail on timeout, no fail on critical errors',
|
|
403
|
-
expected: {
|
|
404
|
-
exitCode: 1,
|
|
405
|
-
summary: Object.assign(Object.assign({}, emptySummary), { failed: 1 }),
|
|
406
|
-
},
|
|
407
|
-
failOnCriticalErrors: false,
|
|
408
|
-
failOnTimeout: true,
|
|
409
|
-
results: new fixtures_1.RenderResultsHelper().getResults([test1Timeout]),
|
|
410
|
-
summary: Object.assign({}, emptySummary),
|
|
411
|
-
},
|
|
412
|
-
{
|
|
413
|
-
description: '1 API test with 1 config override, 1 result (failed critical error), no fail on timeout, no fail on critical errors',
|
|
414
|
-
expected: {
|
|
415
|
-
exitCode: 0,
|
|
416
|
-
summary: Object.assign(Object.assign({}, emptySummary), { passed: 1, criticalErrors: 1 }),
|
|
417
|
-
},
|
|
418
|
-
failOnCriticalErrors: false,
|
|
419
|
-
failOnTimeout: false,
|
|
420
|
-
results: new fixtures_1.RenderResultsHelper().getResults([test1CriticalError]),
|
|
421
|
-
summary: Object.assign({}, emptySummary),
|
|
422
|
-
},
|
|
423
|
-
{
|
|
424
|
-
description: '1 API test with 1 config override, 1 result (failed critical error), no fail on timeout, fail on critical errors',
|
|
425
|
-
expected: {
|
|
426
|
-
exitCode: 1,
|
|
427
|
-
summary: Object.assign(Object.assign({}, emptySummary), { failed: 1 }),
|
|
428
|
-
},
|
|
429
|
-
failOnCriticalErrors: true,
|
|
430
|
-
failOnTimeout: false,
|
|
431
|
-
results: new fixtures_1.RenderResultsHelper().getResults([test1CriticalError]),
|
|
432
|
-
summary: Object.assign({}, emptySummary),
|
|
433
|
-
},
|
|
434
|
-
{
|
|
435
|
-
description: '1 API test (blocking) with 4 config overrides (1 skipped), 3 results (1 passed, 1 failed, 1 failed non-blocking)',
|
|
436
|
-
expected: {
|
|
437
|
-
exitCode: 1,
|
|
438
|
-
summary: Object.assign(Object.assign({}, emptySummary), { failed: 1, failedNonBlocking: 1, passed: 1, skipped: 1 }),
|
|
439
|
-
},
|
|
440
|
-
failOnCriticalErrors: false,
|
|
441
|
-
failOnTimeout: false,
|
|
442
|
-
results: new fixtures_1.RenderResultsHelper().getResults([test1, test1FailedNonBlocking, test1Failed]),
|
|
443
|
-
summary: Object.assign(Object.assign({}, emptySummary), { skipped: 1 }),
|
|
444
|
-
},
|
|
445
|
-
{
|
|
446
|
-
description: '1 API test (non-blocking) with 4 config overrides (1 skipped), 3 results (1 passed, 1 failed, 1 failed non-blocking)',
|
|
447
|
-
expected: {
|
|
448
|
-
exitCode: 0,
|
|
449
|
-
summary: Object.assign(Object.assign({}, emptySummary), { failedNonBlocking: 2, passed: 1, skipped: 1 }),
|
|
450
|
-
},
|
|
451
|
-
failOnCriticalErrors: false,
|
|
452
|
-
failOnTimeout: false,
|
|
453
|
-
results: new fixtures_1.RenderResultsHelper().getResults([
|
|
454
|
-
test1NonBlocking,
|
|
455
|
-
test1NonBlockingFailedNonBlocking,
|
|
456
|
-
test1NonBlockingFailed,
|
|
457
|
-
]),
|
|
458
|
-
summary: Object.assign(Object.assign({}, emptySummary), { skipped: 1 }),
|
|
459
|
-
},
|
|
460
|
-
{
|
|
461
|
-
description: '3 API tests (blocking) with 1 config override each, 3 results (1 failed non-blocking, 1 failed, 1 passed)',
|
|
462
|
-
expected: {
|
|
463
|
-
exitCode: 1,
|
|
464
|
-
summary: Object.assign(Object.assign({}, emptySummary), { failed: 1, failedNonBlocking: 1, passed: 1 }),
|
|
465
|
-
},
|
|
466
|
-
failOnCriticalErrors: false,
|
|
467
|
-
failOnTimeout: false,
|
|
468
|
-
results: new fixtures_1.RenderResultsHelper().getResults([test1FailedNonBlocking, test2Failed, test3]),
|
|
469
|
-
summary: Object.assign({}, emptySummary),
|
|
470
|
-
},
|
|
471
|
-
];
|
|
472
|
-
test.each(cases)('$description', (testCase) => __awaiter(void 0, void 0, void 0, function* () {
|
|
473
|
-
testCase.results.forEach((result) => (result.passed = utils.hasResultPassed(result.result, testCase.failOnCriticalErrors, testCase.failOnTimeout)));
|
|
474
|
-
jest.spyOn(ciUtils, 'parseConfigFile').mockImplementation(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
475
|
-
return (Object.assign(Object.assign({}, command_1.DEFAULT_COMMAND_CONFIG), { failOnCriticalErrors: testCase.failOnCriticalErrors, failOnTimeout: testCase.failOnTimeout }));
|
|
476
|
-
}));
|
|
477
|
-
jest.spyOn(utils, 'getReporter').mockImplementation(() => fixtures_1.mockReporter);
|
|
478
|
-
jest.spyOn(runTests, 'executeTests').mockResolvedValue({
|
|
479
|
-
results: testCase.results,
|
|
480
|
-
summary: testCase.summary,
|
|
481
|
-
});
|
|
482
|
-
const command = new command_1.RunTestCommand();
|
|
483
|
-
const write = jest.fn();
|
|
484
|
-
command.context = { stdout: { write } }; // For the DefaultReporter constructor
|
|
485
|
-
const exitCode = yield command.execute();
|
|
486
|
-
expect(fixtures_1.mockReporter.resultEnd).toHaveBeenCalledTimes(testCase.results.length);
|
|
487
|
-
for (const result of testCase.results) {
|
|
488
|
-
expect(fixtures_1.mockReporter.resultEnd).toHaveBeenCalledWith(result, `https://${command_1.DEFAULT_COMMAND_CONFIG.subdomain}.${command_1.DEFAULT_COMMAND_CONFIG.datadogSite}/`);
|
|
489
|
-
}
|
|
490
|
-
expect(testCase.summary).toEqual(testCase.expected.summary);
|
|
491
|
-
expect(fixtures_1.mockReporter.runEnd).toHaveBeenCalledWith(testCase.expected.summary);
|
|
492
|
-
expect(exitCode).toBe(testCase.expected.exitCode);
|
|
493
|
-
}));
|
|
494
|
-
});
|
|
495
333
|
});
|
|
496
334
|
//# sourceMappingURL=cli.test.js.map
|