@tramvai/test-integration-jest 5.10.0 → 5.14.10
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/lib/browser.js +5 -6
- package/lib/browser.js.map +1 -1
- package/lib/node-environment.js +6 -11
- package/lib/node-environment.js.map +1 -1
- package/lib/watchPlugin.js +20 -9
- package/lib/watchPlugin.js.map +1 -1
- package/package.json +3 -3
package/lib/browser.js
CHANGED
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.closeBrowser = exports.startBrowser = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
4
|
const playwright_core_1 = require("playwright-core");
|
|
6
5
|
const test_pw_1 = require("@tramvai/test-pw");
|
|
7
6
|
let browser;
|
|
8
|
-
const startBrowser = () =>
|
|
9
|
-
browser =
|
|
7
|
+
const startBrowser = async () => {
|
|
8
|
+
browser = await playwright_core_1.chromium.launchServer(test_pw_1.PLAYWRIGHT_DEFAULT_LAUNCH_OPTIONS);
|
|
10
9
|
return browser;
|
|
11
|
-
}
|
|
10
|
+
};
|
|
12
11
|
exports.startBrowser = startBrowser;
|
|
13
|
-
const closeBrowser = () =>
|
|
12
|
+
const closeBrowser = async () => {
|
|
14
13
|
return browser.close();
|
|
15
|
-
}
|
|
14
|
+
};
|
|
16
15
|
exports.closeBrowser = closeBrowser;
|
|
17
16
|
//# sourceMappingURL=browser.js.map
|
package/lib/browser.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../src/browser.ts"],"names":[],"mappings":";;;AACA,qDAA2C;AAC3C,8CAAqE;AAErE,IAAI,OAAsB,CAAC;AAEpB,MAAM,YAAY,GAAG,KAAK,IAAI,EAAE;IACrC,OAAO,GAAG,MAAM,0BAAQ,CAAC,YAAY,CAAC,2CAAiC,CAAC,CAAC;IACzE,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAHW,QAAA,YAAY,gBAGvB;AAEK,MAAM,YAAY,GAAG,KAAK,IAAI,EAAE;IACrC,OAAO,OAAO,CAAC,KAAK,EAAE,CAAC;AACzB,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB"}
|
package/lib/node-environment.js
CHANGED
|
@@ -5,17 +5,12 @@ const jest_environment_node_1 = tslib_1.__importDefault(require("jest-environmen
|
|
|
5
5
|
const console_1 = tslib_1.__importDefault(require("console"));
|
|
6
6
|
const nativeConsole = new console_1.default.Console({ stdout: process.stdout, stderr: process.stderr });
|
|
7
7
|
module.exports = class CustomEnvironment extends jest_environment_node_1.default {
|
|
8
|
-
setup() {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
// пробрасываем дальше глобальные переменные в сами тесты, т.к. global в окружении изолировано от global в тестах
|
|
15
|
-
this.global.__tramvai_cli_mock = global.__tramvai_cli_mock;
|
|
16
|
-
this.global.app = global.app;
|
|
17
|
-
this.global.nativeConsole = nativeConsole;
|
|
18
|
-
});
|
|
8
|
+
async setup() {
|
|
9
|
+
await super.setup();
|
|
10
|
+
// пробрасываем дальше глобальные переменные в сами тесты, т.к. global в окружении изолировано от global в тестах
|
|
11
|
+
this.global.__tramvai_cli_mock = global.__tramvai_cli_mock;
|
|
12
|
+
this.global.app = global.app;
|
|
13
|
+
this.global.nativeConsole = nativeConsole;
|
|
19
14
|
}
|
|
20
15
|
};
|
|
21
16
|
//# sourceMappingURL=node-environment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-environment.js","sourceRoot":"","sources":["../src/node-environment.ts"],"names":[],"mappings":";;;AAAA,0FAAoD;AACpD,8DAA8B;AAE9B,MAAM,aAAa,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;AAE9F,MAAM,CAAC,OAAO,GAAG,MAAM,iBAAkB,SAAQ,+BAAe;
|
|
1
|
+
{"version":3,"file":"node-environment.js","sourceRoot":"","sources":["../src/node-environment.ts"],"names":[],"mappings":";;;AAAA,0FAAoD;AACpD,8DAA8B;AAE9B,MAAM,aAAa,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;AAE9F,MAAM,CAAC,OAAO,GAAG,MAAM,iBAAkB,SAAQ,+BAAe;IAC9D,KAAK,CAAC,KAAK;QACT,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;QAEpB,iHAAiH;QACjH,IAAI,CAAC,MAAM,CAAC,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,CAAC;QAC3D,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QAC7B,IAAI,CAAC,MAAM,CAAC,aAAa,GAAG,aAAa,CAAC;IAC5C,CAAC;CACF,CAAC"}
|
package/lib/watchPlugin.js
CHANGED
|
@@ -17,18 +17,25 @@ module.exports = class TramvaiWatchPlugin extends jest_watcher_1.BaseWatchPlugin
|
|
|
17
17
|
// флаг, чтобы проверять в каком режиме jest находится
|
|
18
18
|
process.env.JEST_MODE = 'watch';
|
|
19
19
|
process.env.NODE_ENV = 'development';
|
|
20
|
-
global.__tramvai_cli_mock =
|
|
21
|
-
|
|
20
|
+
global.__tramvai_cli_mock = {
|
|
21
|
+
...cli,
|
|
22
|
+
start: async (params) => {
|
|
22
23
|
const paramsWithoutStd = (0, omit_1.default)(['stdout', 'stderr'], params);
|
|
23
24
|
if (global.app) {
|
|
24
25
|
if ((0, equal_1.default)(paramsWithoutStd, this.lastStartParams)) {
|
|
25
|
-
|
|
26
|
+
await this.compilationInProgress;
|
|
26
27
|
return global.app;
|
|
27
28
|
}
|
|
28
|
-
|
|
29
|
+
await this.rawApp?.close();
|
|
29
30
|
}
|
|
30
31
|
this.lastStartParams = paramsWithoutStd;
|
|
31
|
-
this.rawApp =
|
|
32
|
+
this.rawApp = await cli.start({
|
|
33
|
+
...params,
|
|
34
|
+
noServerRebuild: false,
|
|
35
|
+
noClientRebuild: false,
|
|
36
|
+
port: 3000,
|
|
37
|
+
staticPort: 4000,
|
|
38
|
+
});
|
|
32
39
|
let resolveCompilationInProgress;
|
|
33
40
|
this.rawApp.builder.on('invalid', (type) => {
|
|
34
41
|
if (type === 'server') {
|
|
@@ -42,12 +49,16 @@ module.exports = class TramvaiWatchPlugin extends jest_watcher_1.BaseWatchPlugin
|
|
|
42
49
|
resolveCompilationInProgress();
|
|
43
50
|
}
|
|
44
51
|
});
|
|
45
|
-
global.app =
|
|
52
|
+
global.app = {
|
|
53
|
+
...this.rawApp,
|
|
54
|
+
close: async () => { },
|
|
55
|
+
};
|
|
46
56
|
return global.app;
|
|
47
|
-
}
|
|
57
|
+
},
|
|
58
|
+
};
|
|
48
59
|
// Проверяем, что только один тест запущен в один момент времени, чтобы в один момент времени только одно приложение было запущено на стандартном порту
|
|
49
60
|
let testPath = '';
|
|
50
|
-
jestHooks.shouldRunTestSuite((testSuite) =>
|
|
61
|
+
jestHooks.shouldRunTestSuite(async (testSuite) => {
|
|
51
62
|
if (testPath) {
|
|
52
63
|
throw new Error(`Do not run many @tramvai integration tests in watch mode, please, narrow down your test pattern so it will match only one test file
|
|
53
64
|
got tests:
|
|
@@ -56,7 +67,7 @@ got tests:
|
|
|
56
67
|
}
|
|
57
68
|
testPath = testSuite.testPath;
|
|
58
69
|
return true;
|
|
59
|
-
})
|
|
70
|
+
});
|
|
60
71
|
jestHooks.onFileChange(() => {
|
|
61
72
|
testPath = '';
|
|
62
73
|
});
|
package/lib/watchPlugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"watchPlugin.js","sourceRoot":"","sources":["../src/watchPlugin.ts"],"names":[],"mappings":";;;AAAA,4EAA8C;AAC9C,8EAA8C;AAI9C,+CAA+C;AAC/C,0DAAoC;AAWpC,MAAM,CAAC,OAAO,GAAG,MAAM,kBAAmB,SAAQ,8BAAe;IAO/D,YAAY,CAAC,YAAiC;QAC5C,mGAAmG;QACnG,IAAI,YAAY,CAAC,UAAU,GAAG,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,gJAAgJ,CACjJ,CAAC;SACH;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,SAA6B;QACjC,sDAAsD;QACtD,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;QAEhC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,aAAa,CAAC;QACrC,MAAM,CAAC,kBAAkB,
|
|
1
|
+
{"version":3,"file":"watchPlugin.js","sourceRoot":"","sources":["../src/watchPlugin.ts"],"names":[],"mappings":";;;AAAA,4EAA8C;AAC9C,8EAA8C;AAI9C,+CAA+C;AAC/C,0DAAoC;AAWpC,MAAM,CAAC,OAAO,GAAG,MAAM,kBAAmB,SAAQ,8BAAe;IAO/D,YAAY,CAAC,YAAiC;QAC5C,mGAAmG;QACnG,IAAI,YAAY,CAAC,UAAU,GAAG,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CACb,gJAAgJ,CACjJ,CAAC;SACH;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,SAA6B;QACjC,sDAAsD;QACtD,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;QAEhC,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,aAAa,CAAC;QACrC,MAAM,CAAC,kBAAkB,GAAG;YAC1B,GAAG,GAAG;YACN,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;gBACtB,MAAM,gBAAgB,GAAG,IAAA,cAAI,EAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;gBAE5D,IAAI,MAAM,CAAC,GAAG,EAAE;oBACd,IAAI,IAAA,eAAO,EAAC,gBAAgB,EAAE,IAAI,CAAC,eAAe,CAAC,EAAE;wBACnD,MAAM,IAAI,CAAC,qBAAqB,CAAC;wBACjC,OAAO,MAAM,CAAC,GAAG,CAAC;qBACnB;oBAED,MAAM,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;iBAC5B;gBAED,IAAI,CAAC,eAAe,GAAG,gBAAgB,CAAC;gBAExC,IAAI,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC;oBAC5B,GAAG,MAAM;oBACT,eAAe,EAAE,KAAK;oBACtB,eAAe,EAAE,KAAK;oBACtB,IAAI,EAAE,IAAI;oBACV,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;gBAEH,IAAI,4BAAwC,CAAC;gBAE7C,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;oBACzC,IAAI,IAAI,KAAK,QAAQ,EAAE;wBACrB,IAAI,CAAC,qBAAqB,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;4BACnD,4BAA4B,GAAG,OAAO,CAAC;wBACzC,CAAC,CAAC,CAAC;qBACJ;gBACH,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBACtC,IAAI,IAAI,KAAK,QAAQ,EAAE;wBACrB,4BAA4B,EAAE,CAAC;qBAChC;gBACH,CAAC,CAAC,CAAC;gBAEH,MAAM,CAAC,GAAG,GAAG;oBACX,GAAG,IAAI,CAAC,MAAM;oBACd,KAAK,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;iBACtB,CAAC;gBAEF,OAAO,MAAM,CAAC,GAAG,CAAC;YACpB,CAAC;SACF,CAAC;QAEF,uJAAuJ;QACvJ,IAAI,QAAQ,GAAG,EAAE,CAAC;QAElB,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;YAC/C,IAAI,QAAQ,EAAE;gBACZ,MAAM,IAAI,KAAK,CACb;;IAEN,QAAQ;IACR,SAAS,CAAC,QAAQ,EAAE,CACf,CAAC;aACH;YAED,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;YAE9B,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE;YAC1B,QAAQ,GAAG,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tramvai/test-integration-jest",
|
|
3
|
-
"version": "5.10
|
|
3
|
+
"version": "5.14.10",
|
|
4
4
|
"description": "",
|
|
5
5
|
"files": [
|
|
6
6
|
"lib"
|
|
@@ -20,13 +20,13 @@
|
|
|
20
20
|
"@swc/core": "1.3.100",
|
|
21
21
|
"@swc/helpers": "0.5.1",
|
|
22
22
|
"@tinkoff/utils": "^2.1.2",
|
|
23
|
-
"@tramvai/test-pw": "5.10
|
|
23
|
+
"@tramvai/test-pw": "5.14.10",
|
|
24
24
|
"jest-watcher": "^29.5.0",
|
|
25
25
|
"tslib": "^2.4.0",
|
|
26
26
|
"utility-types": "^3.10.0"
|
|
27
27
|
},
|
|
28
28
|
"peerDependencies": {
|
|
29
|
-
"@tramvai/cli": "5.10
|
|
29
|
+
"@tramvai/cli": "5.14.10",
|
|
30
30
|
"jest-environment-node": "^27 || ^28 || ^29",
|
|
31
31
|
"playwright-core": "*"
|
|
32
32
|
},
|