@datadog/datadog-ci 1.7.1 → 1.7.2-alpha
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/dsyms/interfaces.d.ts +1 -0
- package/dist/commands/dsyms/interfaces.js +15 -4
- package/dist/commands/dsyms/interfaces.js.map +1 -1
- package/dist/commands/git-metadata/interfaces.d.ts +1 -0
- package/dist/commands/git-metadata/interfaces.js +15 -4
- package/dist/commands/git-metadata/interfaces.js.map +1 -1
- package/dist/commands/sourcemaps/interfaces.d.ts +1 -0
- package/dist/commands/sourcemaps/interfaces.js +32 -20
- package/dist/commands/sourcemaps/interfaces.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 +30 -69
- package/dist/commands/synthetics/__tests__/cli.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/fixtures.d.ts +9 -15
- package/dist/commands/synthetics/__tests__/fixtures.js +75 -56
- package/dist/commands/synthetics/__tests__/fixtures.js.map +1 -1
- package/dist/commands/synthetics/__tests__/reporters/default.test.js +14 -26
- 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 +35 -3
- package/dist/commands/synthetics/__tests__/run-test.test.js.map +1 -1
- package/dist/commands/synthetics/__tests__/utils.test.js +107 -223
- package/dist/commands/synthetics/__tests__/utils.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.js +3 -8
- 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 +29 -28
- 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 +25 -8
- package/dist/commands/synthetics/reporters/default.js.map +1 -1
- package/dist/commands/synthetics/reporters/junit.js +3 -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 +13 -9
- package/dist/commands/synthetics/run-test.js.map +1 -1
- package/dist/commands/synthetics/utils.d.ts +3 -4
- package/dist/commands/synthetics/utils.js +61 -103
- package/dist/commands/synthetics/utils.js.map +1 -1
- package/package.json +2 -1
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
import * as http from 'http';
|
|
4
4
|
import { ProxyConfiguration } from '../../../helpers/utils';
|
|
5
|
-
import { ApiServerResult, BrowserServerResult, CommandConfig,
|
|
5
|
+
import { ApiServerResult, Batch, BrowserServerResult, CommandConfig, ExecutionRule, Location, MainReporter, MultiStep, MultiStepsServerResult, Result, Step, Suite, Summary, Test, Trigger } from '../interfaces';
|
|
6
6
|
export declare type MockedReporter = {
|
|
7
7
|
[K in keyof MainReporter]: jest.Mock<void, Parameters<MainReporter[K]>>;
|
|
8
8
|
};
|
|
@@ -15,9 +15,9 @@ export declare const getTestSuite: () => Suite;
|
|
|
15
15
|
export declare const getBrowserResult: (resultId: string, test: Test, resultOpts?: Partial<BrowserServerResult>) => Result;
|
|
16
16
|
export declare const getApiResult: (resultId: string, test: Test, resultOpts?: Partial<ApiServerResult>) => Result;
|
|
17
17
|
export declare const getBrowserServerResult: (opts?: Partial<BrowserServerResult>) => BrowserServerResult;
|
|
18
|
+
export declare const getFailedBrowserResult: () => Result;
|
|
18
19
|
export declare const getApiServerResult: (opts?: Partial<ApiServerResult>) => ApiServerResult;
|
|
19
20
|
export declare const getMultiStepsServerResult: () => MultiStepsServerResult;
|
|
20
|
-
export declare const getTriggerResult: (publicId: string, resultId: string) => TriggerResponse;
|
|
21
21
|
export declare const mockLocation: Location;
|
|
22
22
|
export declare const mockSearchResponse: {
|
|
23
23
|
tests: {
|
|
@@ -49,19 +49,13 @@ export interface RenderResultsTestCase {
|
|
|
49
49
|
results: Result[];
|
|
50
50
|
summary: Summary;
|
|
51
51
|
}
|
|
52
|
-
interface
|
|
53
|
-
configOverride: ConfigOverride;
|
|
52
|
+
interface ResultFixtures {
|
|
54
53
|
executionRule?: ExecutionRule;
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
}
|
|
60
|
-
export declare class RenderResultsHelper {
|
|
61
|
-
private resultIdCounter;
|
|
62
|
-
getResults(testFixturesConfigs: RenderResultsTestFixtureConfigs[]): Result[];
|
|
63
|
-
private getNextTriggerResultAndResult;
|
|
64
|
-
private getTestFixtures;
|
|
65
|
-
private resetResultIdCounter;
|
|
54
|
+
passed?: boolean;
|
|
55
|
+
testExecutionRule?: ExecutionRule;
|
|
56
|
+
timedOut?: boolean;
|
|
57
|
+
unhealthy?: boolean;
|
|
66
58
|
}
|
|
59
|
+
export declare const getResults: (resultsFixtures: ResultFixtures[]) => Result[];
|
|
60
|
+
export declare const getBatch: () => Batch;
|
|
67
61
|
export {};
|
|
@@ -18,15 +18,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
18
18
|
__setModuleDefault(result, mod);
|
|
19
19
|
return result;
|
|
20
20
|
};
|
|
21
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
22
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
|
-
};
|
|
24
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
-
exports.
|
|
26
|
-
const deep_extend_1 = __importDefault(require("deep-extend"));
|
|
22
|
+
exports.getBatch = exports.getResults = exports.getSyntheticsProxy = exports.mockTestTriggerResponse = exports.mockSearchResponse = exports.mockLocation = exports.getMultiStepsServerResult = exports.getApiServerResult = exports.getFailedBrowserResult = exports.getBrowserServerResult = exports.getApiResult = exports.getBrowserResult = exports.getTestSuite = exports.getMultiStep = exports.getStep = exports.getApiTest = exports.ciConfig = exports.mockReporter = void 0;
|
|
27
23
|
const http = __importStar(require("http"));
|
|
28
24
|
const url_1 = require("url");
|
|
29
25
|
const ws_1 = require("ws");
|
|
26
|
+
const interfaces_1 = require("../interfaces");
|
|
30
27
|
const mockUser = {
|
|
31
28
|
email: '',
|
|
32
29
|
handle: '',
|
|
@@ -132,10 +129,12 @@ exports.getMultiStep = getMultiStep;
|
|
|
132
129
|
const getTestSuite = () => ({ content: { tests: [{ config: {}, id: '123-456-789' }] }, name: 'Suite 1' });
|
|
133
130
|
exports.getTestSuite = getTestSuite;
|
|
134
131
|
const getBaseResult = (resultId, test) => ({
|
|
132
|
+
executionRule: interfaces_1.ExecutionRule.BLOCKING,
|
|
135
133
|
location: 'Frankfurt (AWS)',
|
|
136
134
|
passed: true,
|
|
137
135
|
resultId,
|
|
138
136
|
test,
|
|
137
|
+
timedOut: false,
|
|
139
138
|
timestamp: 1,
|
|
140
139
|
});
|
|
141
140
|
const getBrowserResult = (resultId, test, resultOpts = {}) => (Object.assign(Object.assign({}, getBaseResult(resultId, test)), { result: exports.getBrowserServerResult(resultOpts) }));
|
|
@@ -146,32 +145,58 @@ const getBrowserServerResult = (opts = {}) => (Object.assign({ device: {
|
|
|
146
145
|
height: 1,
|
|
147
146
|
id: 'laptop_large',
|
|
148
147
|
width: 1,
|
|
149
|
-
}, duration: 0,
|
|
148
|
+
}, duration: 0, passed: true, startUrl: '', stepDetails: [] }, opts));
|
|
150
149
|
exports.getBrowserServerResult = getBrowserServerResult;
|
|
150
|
+
const getFailedBrowserResult = () => ({
|
|
151
|
+
executionRule: interfaces_1.ExecutionRule.BLOCKING,
|
|
152
|
+
location: 'Location name',
|
|
153
|
+
passed: false,
|
|
154
|
+
result: {
|
|
155
|
+
device: { height: 1100, id: 'chrome.laptop_large', width: 1440 },
|
|
156
|
+
duration: 20000,
|
|
157
|
+
error: 'Step failed because it took more than 20 seconds.',
|
|
158
|
+
failure: { code: 'STEP_TIMEOUT', message: 'Step failed because it took more than 20 seconds.' },
|
|
159
|
+
passed: false,
|
|
160
|
+
startUrl: 'https://example.org/',
|
|
161
|
+
stepDetails: [
|
|
162
|
+
Object.assign(Object.assign({}, exports.getStep()), { browserErrors: [{ description: 'Error', name: 'Console error', type: 'js' }], description: 'Navigate to start URL', duration: 1000, skipped: false, stepId: -1, type: 'goToUrlAndMeasureTti', url: 'https://example.org/', value: 'https://example.org/', vitalsMetrics: [{ url: 'https://example.com', lcp: 100, cls: 0 }] }),
|
|
163
|
+
Object.assign(Object.assign({}, exports.getStep()), { allowFailure: true, description: 'Navigate', duration: 1000, error: 'Navigation failure', skipped: true, stepId: 2, type: 'goToUrl', url: 'https://example.org/', value: 'https://example.org/', vitalsMetrics: [] }),
|
|
164
|
+
Object.assign(Object.assign({}, exports.getStep()), { description: 'Assert', duration: 1000, error: 'Step failure', publicId: 'abc-def-hij', skipped: true, stepId: 3, type: 'assertElementContent', url: 'https://example.org/', vitalsMetrics: [] }),
|
|
165
|
+
Object.assign(Object.assign({}, exports.getStep()), { skipped: true }),
|
|
166
|
+
Object.assign(Object.assign({}, exports.getStep()), { skipped: true }),
|
|
167
|
+
Object.assign(Object.assign({}, exports.getStep()), { skipped: true }),
|
|
168
|
+
],
|
|
169
|
+
},
|
|
170
|
+
resultId: '1',
|
|
171
|
+
test: Object.assign(Object.assign({}, exports.getApiTest()), { config: {
|
|
172
|
+
assertions: [],
|
|
173
|
+
request: {
|
|
174
|
+
headers: {},
|
|
175
|
+
method: 'GET',
|
|
176
|
+
timeout: 1,
|
|
177
|
+
url: 'https://example.org/',
|
|
178
|
+
},
|
|
179
|
+
variables: [],
|
|
180
|
+
}, locations: [''], message: 'Description.', name: 'Test name', options: { device_ids: ['chrome.laptop_large'], min_failure_duration: 0, min_location_failed: 1, tick_every: 300 }, public_id: 'abc-def-hij', type: 'browser' }),
|
|
181
|
+
timedOut: false,
|
|
182
|
+
timestamp: 1,
|
|
183
|
+
});
|
|
184
|
+
exports.getFailedBrowserResult = getFailedBrowserResult;
|
|
151
185
|
const getApiServerResult = (opts = {}) => (Object.assign({ assertionResults: [
|
|
152
186
|
{
|
|
153
187
|
actual: 'actual',
|
|
154
188
|
valid: true,
|
|
155
189
|
},
|
|
156
|
-
],
|
|
190
|
+
], passed: true, timings: {
|
|
157
191
|
total: 123,
|
|
158
192
|
} }, opts));
|
|
159
193
|
exports.getApiServerResult = getApiServerResult;
|
|
160
194
|
const getMultiStepsServerResult = () => ({
|
|
161
195
|
duration: 123,
|
|
162
|
-
eventType: 'finished',
|
|
163
196
|
passed: true,
|
|
164
197
|
steps: [],
|
|
165
198
|
});
|
|
166
199
|
exports.getMultiStepsServerResult = getMultiStepsServerResult;
|
|
167
|
-
const mockTriggerResult = {
|
|
168
|
-
device: 'chrome_laptop.large',
|
|
169
|
-
location: 1,
|
|
170
|
-
public_id: '123-456-789',
|
|
171
|
-
result_id: '1',
|
|
172
|
-
};
|
|
173
|
-
const getTriggerResult = (publicId, resultId) => (Object.assign(Object.assign({}, mockTriggerResult), { public_id: publicId, result_id: resultId }));
|
|
174
|
-
exports.getTriggerResult = getTriggerResult;
|
|
175
200
|
exports.mockLocation = {
|
|
176
201
|
display_name: 'Frankfurt (AWS)',
|
|
177
202
|
id: 1,
|
|
@@ -181,8 +206,8 @@ exports.mockLocation = {
|
|
|
181
206
|
};
|
|
182
207
|
exports.mockSearchResponse = { tests: [{ public_id: '123-456-789' }] };
|
|
183
208
|
exports.mockTestTriggerResponse = {
|
|
209
|
+
batch_id: 'bid',
|
|
184
210
|
locations: [exports.mockLocation],
|
|
185
|
-
results: [mockTriggerResult],
|
|
186
211
|
};
|
|
187
212
|
const mockTunnelConnectionFirstMessage = { host: 'host', id: 'tunnel-id' };
|
|
188
213
|
const getSyntheticsProxy = () => {
|
|
@@ -244,45 +269,39 @@ const getSyntheticsProxy = () => {
|
|
|
244
269
|
return { calls, close, config, server };
|
|
245
270
|
};
|
|
246
271
|
exports.getSyntheticsProxy = getSyntheticsProxy;
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
const testFixtures = this.getTestFixtures(testFixturesConfig);
|
|
255
|
-
results.push(testFixtures.result);
|
|
272
|
+
const getResults = (resultsFixtures) => {
|
|
273
|
+
const results = [];
|
|
274
|
+
for (const [index, resultFixtures] of resultsFixtures.entries()) {
|
|
275
|
+
const { executionRule, passed, testExecutionRule, timedOut, unhealthy } = resultFixtures;
|
|
276
|
+
const test = exports.getApiTest();
|
|
277
|
+
if (testExecutionRule) {
|
|
278
|
+
test.options.ci = { executionRule: testExecutionRule };
|
|
256
279
|
}
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
this.resultIdCounter++;
|
|
267
|
-
return [triggerResult, result];
|
|
268
|
-
}
|
|
269
|
-
getTestFixtures({ configOverride, executionRule, publicId, resultError, resultIsUnhealthy, resultPassed, }) {
|
|
270
|
-
const test = executionRule
|
|
271
|
-
? deep_extend_1.default(exports.getApiTest(publicId), { options: { ci: { executionRule } } })
|
|
272
|
-
: exports.getApiTest(publicId);
|
|
273
|
-
const [triggerResult, result] = this.getNextTriggerResultAndResult({
|
|
274
|
-
configOverride,
|
|
275
|
-
publicId,
|
|
276
|
-
resultError,
|
|
277
|
-
resultIsUnhealthy,
|
|
278
|
-
resultPassed,
|
|
279
|
-
test,
|
|
280
|
-
});
|
|
281
|
-
return { test, triggerResult, result };
|
|
282
|
-
}
|
|
283
|
-
resetResultIdCounter() {
|
|
284
|
-
this.resultIdCounter = 1;
|
|
280
|
+
const result = exports.getApiResult(index.toString(), test);
|
|
281
|
+
result.executionRule = testExecutionRule || executionRule || interfaces_1.ExecutionRule.BLOCKING;
|
|
282
|
+
result.passed = !!passed;
|
|
283
|
+
result.result = Object.assign(Object.assign({}, result.result), { passed: !!passed, unhealthy });
|
|
284
|
+
if (timedOut) {
|
|
285
|
+
result.timedOut = true;
|
|
286
|
+
result.result.error = 'Timeout';
|
|
287
|
+
}
|
|
288
|
+
results.push(result);
|
|
285
289
|
}
|
|
286
|
-
|
|
287
|
-
|
|
290
|
+
return results;
|
|
291
|
+
};
|
|
292
|
+
exports.getResults = getResults;
|
|
293
|
+
const getBatch = () => ({
|
|
294
|
+
results: [
|
|
295
|
+
{
|
|
296
|
+
execution_rule: interfaces_1.ExecutionRule.BLOCKING,
|
|
297
|
+
location: exports.mockLocation.name,
|
|
298
|
+
result_id: 'rid',
|
|
299
|
+
status: 'passed',
|
|
300
|
+
test_public_id: 'pid',
|
|
301
|
+
timed_out: false,
|
|
302
|
+
},
|
|
303
|
+
],
|
|
304
|
+
status: 'passed',
|
|
305
|
+
});
|
|
306
|
+
exports.getBatch = getBatch;
|
|
288
307
|
//# sourceMappingURL=fixtures.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixtures.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/__tests__/fixtures.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fixtures.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/__tests__/fixtures.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const deep_extend_1 = __importDefault(require("deep-extend"));
|
|
7
3
|
const interfaces_1 = require("../../interfaces");
|
|
8
4
|
const default_1 = require("../../reporters/default");
|
|
9
5
|
const utils_1 = require("../../utils");
|
|
@@ -16,6 +12,7 @@ const fixtures_1 = require("../fixtures");
|
|
|
16
12
|
* More information on https://jestjs.io/docs/snapshot-testing.
|
|
17
13
|
*/
|
|
18
14
|
describe('Default reporter', () => {
|
|
15
|
+
const baseUrlFixture = 'https://app.datadoghq.com/';
|
|
19
16
|
const writeMock = jest.fn();
|
|
20
17
|
const mockContext = {
|
|
21
18
|
context: {
|
|
@@ -33,7 +30,7 @@ describe('Default reporter', () => {
|
|
|
33
30
|
['log', ['log']],
|
|
34
31
|
['reportStart', [{ startTime: 0 }]],
|
|
35
32
|
['resultEnd', [fixtures_1.getApiResult('1', fixtures_1.getApiTest()), '']],
|
|
36
|
-
['runEnd', [utils_1.createSummary()]],
|
|
33
|
+
['runEnd', [utils_1.createSummary(), '']],
|
|
37
34
|
['testTrigger', [{}, '', '', {}]],
|
|
38
35
|
['testsWait', [[{}]]],
|
|
39
36
|
];
|
|
@@ -90,9 +87,6 @@ describe('Default reporter', () => {
|
|
|
90
87
|
});
|
|
91
88
|
});
|
|
92
89
|
describe('resultEnd', () => {
|
|
93
|
-
beforeEach(() => {
|
|
94
|
-
writeMock.mockClear();
|
|
95
|
-
});
|
|
96
90
|
const createApiResult = (resultId, passed, executionRule = interfaces_1.ExecutionRule.BLOCKING, test) => {
|
|
97
91
|
const errorMessage = JSON.stringify([
|
|
98
92
|
{
|
|
@@ -103,16 +97,13 @@ describe('Default reporter', () => {
|
|
|
103
97
|
},
|
|
104
98
|
]);
|
|
105
99
|
const failure = { code: 'INCORRECT_ASSERTION', message: errorMessage };
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
100
|
+
const result = fixtures_1.getApiResult(resultId, test);
|
|
101
|
+
result.executionRule = executionRule;
|
|
102
|
+
result.passed = passed;
|
|
103
|
+
result.result = Object.assign(Object.assign(Object.assign({}, result.result), (passed ? {} : { failure })), { passed });
|
|
104
|
+
return result;
|
|
111
105
|
};
|
|
112
|
-
const getNonBlockingApiTest = (publicId) => deep_extend_1.default(fixtures_1.getApiTest(publicId), { options: { ci: { executionRule: interfaces_1.ExecutionRule.NON_BLOCKING } } });
|
|
113
|
-
const baseUrlFixture = 'https://app.datadoghq.com/';
|
|
114
106
|
const apiTest = fixtures_1.getApiTest('aaa-aaa-aaa');
|
|
115
|
-
const nonBlockingApiTest = getNonBlockingApiTest('aaa-aaa-aaa');
|
|
116
107
|
const cases = [
|
|
117
108
|
{
|
|
118
109
|
description: '1 API test, 1 location, 1 result: success',
|
|
@@ -122,25 +113,21 @@ describe('Default reporter', () => {
|
|
|
122
113
|
},
|
|
123
114
|
},
|
|
124
115
|
{
|
|
125
|
-
description: '1 API test
|
|
116
|
+
description: '1 API test, 1 location, 3 results: success, failed non-blocking, failed blocking',
|
|
126
117
|
fixtures: {
|
|
127
118
|
baseUrl: baseUrlFixture,
|
|
128
119
|
results: [
|
|
129
|
-
|
|
120
|
+
createApiResult('1', true, interfaces_1.ExecutionRule.BLOCKING, apiTest),
|
|
130
121
|
createApiResult('2', false, interfaces_1.ExecutionRule.NON_BLOCKING, apiTest),
|
|
131
|
-
createApiResult('3', false,
|
|
122
|
+
createApiResult('3', false, interfaces_1.ExecutionRule.BLOCKING, apiTest),
|
|
132
123
|
],
|
|
133
124
|
},
|
|
134
125
|
},
|
|
135
126
|
{
|
|
136
|
-
description: '1
|
|
127
|
+
description: '1 Browser test: failed blocking',
|
|
137
128
|
fixtures: {
|
|
138
129
|
baseUrl: baseUrlFixture,
|
|
139
|
-
results: [
|
|
140
|
-
fixtures_1.getApiResult('1', nonBlockingApiTest),
|
|
141
|
-
createApiResult('2', false, interfaces_1.ExecutionRule.NON_BLOCKING, nonBlockingApiTest),
|
|
142
|
-
createApiResult('3', false, undefined, nonBlockingApiTest),
|
|
143
|
-
],
|
|
130
|
+
results: [fixtures_1.getFailedBrowserResult()],
|
|
144
131
|
},
|
|
145
132
|
},
|
|
146
133
|
];
|
|
@@ -159,6 +146,7 @@ describe('Default reporter', () => {
|
|
|
159
146
|
});
|
|
160
147
|
const baseSummary = utils_1.createSummary();
|
|
161
148
|
const complexSummary = {
|
|
149
|
+
batchId: 'batch-id',
|
|
162
150
|
criticalErrors: 2,
|
|
163
151
|
failed: 1,
|
|
164
152
|
failedNonBlocking: 3,
|
|
@@ -182,7 +170,7 @@ describe('Default reporter', () => {
|
|
|
182
170
|
},
|
|
183
171
|
];
|
|
184
172
|
test.each(cases)('$description', (testCase) => {
|
|
185
|
-
reporter.runEnd(testCase.summary);
|
|
173
|
+
reporter.runEnd(testCase.summary, baseUrlFixture);
|
|
186
174
|
const mostRecentOutput = writeMock.mock.calls[writeMock.mock.calls.length - 1][0];
|
|
187
175
|
expect(mostRecentOutput).toMatchSnapshot();
|
|
188
176
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.test.js","sourceRoot":"","sources":["../../../../../src/commands/synthetics/__tests__/reporters/default.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"default.test.js","sourceRoot":"","sources":["../../../../../src/commands/synthetics/__tests__/reporters/default.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
// tslint:disable: no-string-literal
|
|
13
13
|
const fs_1 = require("fs");
|
|
14
|
-
const interfaces_1 = require("../../interfaces");
|
|
15
14
|
const junit_1 = require("../../reporters/junit");
|
|
16
15
|
const fixtures_1 = require("../fixtures");
|
|
17
16
|
const globalTestMock = fixtures_1.getApiTest('123-456-789');
|
|
@@ -120,7 +119,7 @@ describe('Junit reporter', () => {
|
|
|
120
119
|
fixtures_1.getStep(),
|
|
121
120
|
] }) });
|
|
122
121
|
const browserResult2 = Object.assign(Object.assign({}, globalResultMock), { result: fixtures_1.getBrowserServerResult() });
|
|
123
|
-
const browserResult3 = Object.assign(Object.assign({}, globalResultMock), { result: Object.assign(Object.assign({}, fixtures_1.getBrowserServerResult()), { error:
|
|
122
|
+
const browserResult3 = Object.assign(Object.assign({}, globalResultMock), { result: Object.assign(Object.assign({}, fixtures_1.getBrowserServerResult()), { error: 'Timeout' }), timedOut: true });
|
|
124
123
|
const apiResult = Object.assign(Object.assign({}, globalResultMock), { result: Object.assign(Object.assign({}, fixtures_1.getMultiStepsServerResult()), { steps: [
|
|
125
124
|
Object.assign(Object.assign({}, fixtures_1.getMultiStep()), { failure: {
|
|
126
125
|
code: '1',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"junit.test.js","sourceRoot":"","sources":["../../../../../src/commands/synthetics/__tests__/reporters/junit.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,oCAAoC;AACpC,2BAAiC;
|
|
1
|
+
{"version":3,"file":"junit.test.js","sourceRoot":"","sources":["../../../../../src/commands/synthetics/__tests__/reporters/junit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,6 +60,36 @@ describe('run-test', () => {
|
|
|
60
60
|
expect.objectContaining({ id: 'public-id-2', config: configOverride }),
|
|
61
61
|
]), expect.anything());
|
|
62
62
|
}));
|
|
63
|
+
test.each([
|
|
64
|
+
[
|
|
65
|
+
'locations in global config only',
|
|
66
|
+
{ global: { locations: ['global-location-1'] } },
|
|
67
|
+
{ locations: ['global-location-1'] },
|
|
68
|
+
],
|
|
69
|
+
[
|
|
70
|
+
'locations in env var only',
|
|
71
|
+
{ locations: ['envvar-location-1', 'envvar-location-2'] },
|
|
72
|
+
{ locations: ['envvar-location-1', 'envvar-location-2'] },
|
|
73
|
+
],
|
|
74
|
+
[
|
|
75
|
+
'locations in both global config and env var',
|
|
76
|
+
{ global: { locations: ['global-location-1'] }, locations: ['envvar-location-1', 'envvar-location-2'] },
|
|
77
|
+
{ locations: ['envvar-location-1', 'envvar-location-2'] },
|
|
78
|
+
],
|
|
79
|
+
])('Use appropriate list of locations for tests triggered by public id: %s', (text, partialCIConfig, expectedOverriddenConfig) => __awaiter(void 0, void 0, void 0, function* () {
|
|
80
|
+
const getTestsToTriggersMock = jest.spyOn(utils, 'getTestsToTrigger').mockReturnValue(Promise.resolve({
|
|
81
|
+
overriddenTestsToTrigger: [],
|
|
82
|
+
summary: utils.createSummary(),
|
|
83
|
+
tests: [],
|
|
84
|
+
}));
|
|
85
|
+
const apiHelper = {};
|
|
86
|
+
jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => ({}));
|
|
87
|
+
yield expect(runTests.executeTests(fixtures_1.mockReporter, Object.assign(Object.assign(Object.assign({}, fixtures_1.ciConfig), partialCIConfig), { publicIds: ['public-id-1', 'public-id-2'] }))).rejects.toMatchError(new errors_1.CiError('NO_TESTS_TO_RUN'));
|
|
88
|
+
expect(getTestsToTriggersMock).toHaveBeenCalledWith(apiHelper, expect.arrayContaining([
|
|
89
|
+
expect.objectContaining({ id: 'public-id-1', config: expectedOverriddenConfig }),
|
|
90
|
+
expect.objectContaining({ id: 'public-id-2', config: expectedOverriddenConfig }),
|
|
91
|
+
]), expect.anything());
|
|
92
|
+
}));
|
|
63
93
|
test('should not wait for `skipped` only tests batch results', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
64
94
|
const getTestsToTriggersMock = jest.spyOn(utils, 'getTestsToTrigger').mockReturnValue(Promise.resolve({
|
|
65
95
|
overriddenTestsToTrigger: [],
|
|
@@ -106,8 +136,9 @@ describe('run-test', () => {
|
|
|
106
136
|
}));
|
|
107
137
|
jest.spyOn(utils, 'runTests').mockResolvedValue(fixtures_1.mockTestTriggerResponse);
|
|
108
138
|
const apiHelper = {
|
|
139
|
+
getBatch: () => ({ results: [] }),
|
|
109
140
|
getPresignedURL: () => ({ url: 'url' }),
|
|
110
|
-
pollResults: () =>
|
|
141
|
+
pollResults: () => [fixtures_1.getApiResult('1', fixtures_1.getApiTest())],
|
|
111
142
|
triggerTests: () => fixtures_1.mockTestTriggerResponse,
|
|
112
143
|
};
|
|
113
144
|
jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);
|
|
@@ -203,20 +234,21 @@ describe('run-test', () => {
|
|
|
203
234
|
tests: [{ options: { ci: { executionRule: interfaces_1.ExecutionRule.BLOCKING } }, public_id: 'publicId' }],
|
|
204
235
|
}));
|
|
205
236
|
jest.spyOn(utils, 'runTests').mockReturnValue(Promise.resolve({
|
|
237
|
+
batch_id: 'bid',
|
|
206
238
|
locations: [location],
|
|
207
|
-
results: [{ device: 'chrome_laptop.large', location: 1, public_id: 'publicId', result_id: '1111' }],
|
|
208
239
|
}));
|
|
209
240
|
const serverError = new Error('Server Error');
|
|
210
241
|
serverError.response = { data: { errors: ['Bad Gateway'] }, status: 502 };
|
|
211
242
|
serverError.config = { baseURL: 'baseURL', url: 'url' };
|
|
212
243
|
const apiHelper = {
|
|
244
|
+
getBatch: () => ({ results: [] }),
|
|
213
245
|
getPresignedURL: () => ({ url: 'url' }),
|
|
214
246
|
pollResults: jest.fn(() => {
|
|
215
247
|
throw serverError;
|
|
216
248
|
}),
|
|
217
249
|
};
|
|
218
250
|
jest.spyOn(runTests, 'getApiHelper').mockImplementation(() => apiHelper);
|
|
219
|
-
yield expect(runTests.executeTests(fixtures_1.mockReporter, Object.assign(Object.assign({}, fixtures_1.ciConfig), { failOnCriticalErrors: true, publicIds: ['public-id-1', 'public-id-2'], tunnel: true }))).rejects.toMatchError(new errors_1.CriticalError('POLL_RESULTS_FAILED', '
|
|
251
|
+
yield expect(runTests.executeTests(fixtures_1.mockReporter, Object.assign(Object.assign({}, fixtures_1.ciConfig), { failOnCriticalErrors: true, publicIds: ['public-id-1', 'public-id-2'], tunnel: true }))).rejects.toMatchError(new errors_1.CriticalError('POLL_RESULTS_FAILED', 'Failed to poll results: query on baseURLurl returned: "Bad Gateway"\n'));
|
|
220
252
|
expect(stopTunnelSpy).toHaveBeenCalledTimes(1);
|
|
221
253
|
}));
|
|
222
254
|
});
|