@zohodesk/testinglibrary 2.9.2 → 2.9.3
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/.gitlab-ci.yml +21 -0
- package/build/core/playwright/builtInFixtures/page.js +7 -0
- package/build/core/playwright/constants/fileMutexConfig.js +7 -3
- package/build/core/playwright/helpers/auth/loginSteps.js +2 -1
- package/build/core/playwright/helpers/checkAuthDirectory.js +10 -0
- package/build/core/playwright/helpers/fileMutex.js +20 -23
- package/build/core/playwright/runner/Runner.js +22 -0
- package/build/core/playwright/runner/RunnerHelper.js +43 -0
- package/build/core/playwright/runner/RunnerTypes.js +17 -0
- package/build/core/playwright/runner/SpawnRunner.js +110 -0
- package/build/core/playwright/test-runner.js +8 -34
- package/build/test/core/playwright/helpers/__tests__/fileMutex.test.js +45 -68
- package/build/test/core/playwright/runner/__tests__/RunnerHelper.test.js +16 -0
- package/build/test/core/playwright/runner/__tests__/SpawnRunner.test.js +27 -0
- package/nobdd/uat.config.js +2 -1
- package/package.json +2 -2
package/.gitlab-ci.yml
CHANGED
|
@@ -86,6 +86,27 @@ uat-profile:
|
|
|
86
86
|
paths:
|
|
87
87
|
- examples/uat/playwright-report
|
|
88
88
|
|
|
89
|
+
|
|
90
|
+
uat-unauth:
|
|
91
|
+
stage: uat
|
|
92
|
+
image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v2
|
|
93
|
+
script:
|
|
94
|
+
- npm install
|
|
95
|
+
- npm run build
|
|
96
|
+
- cd examples
|
|
97
|
+
- npm install $(npm pack ../../testing-framework | tail -1)
|
|
98
|
+
- output=$(npm run uatunauth)
|
|
99
|
+
- echo "$output"
|
|
100
|
+
- if [[ "$output" == *"failed"* ]]; then
|
|
101
|
+
- exit 1
|
|
102
|
+
- fi
|
|
103
|
+
|
|
104
|
+
|
|
105
|
+
artifacts:
|
|
106
|
+
when: always
|
|
107
|
+
paths:
|
|
108
|
+
- examples/uat/playwright-report
|
|
109
|
+
|
|
89
110
|
uat-nobdd:
|
|
90
111
|
stage: uat
|
|
91
112
|
script:
|
|
@@ -70,6 +70,13 @@ var _default = exports.default = {
|
|
|
70
70
|
await use(page);
|
|
71
71
|
return;
|
|
72
72
|
}
|
|
73
|
+
|
|
74
|
+
//This block is used to skip the login process if the @unauthenticated tag is added to the script
|
|
75
|
+
if ($tags.includes('@unauthenticated')) {
|
|
76
|
+
await context.clearCookies();
|
|
77
|
+
await use(page);
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
73
80
|
const testPortalDetails = getCustomAccountDetails($tags);
|
|
74
81
|
if (testPortalDetails === null) {
|
|
75
82
|
await performDefaultPageSteps({
|
|
@@ -5,7 +5,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.LOGIN_MUTEX_TIMEOUT = void 0;
|
|
7
7
|
const LOGIN_MUTEX_TIMEOUT = exports.LOGIN_MUTEX_TIMEOUT = {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
stale: 100000,
|
|
9
|
+
retries: {
|
|
10
|
+
retries: 10,
|
|
11
|
+
factor: 1,
|
|
12
|
+
minTimeout: 10000,
|
|
13
|
+
maxTimeout: 20000
|
|
14
|
+
}
|
|
11
15
|
};
|
|
@@ -10,6 +10,7 @@ var _fileMutex = _interopRequireDefault(require("../fileMutex"));
|
|
|
10
10
|
var _fileMutexConfig = require("../../constants/fileMutexConfig");
|
|
11
11
|
var _accountLogin = _interopRequireDefault(require("./accountLogin"));
|
|
12
12
|
var _checkAuthCookies = require("./checkAuthCookies");
|
|
13
|
+
var _checkAuthDirectory = require("../checkAuthDirectory");
|
|
13
14
|
/* eslint-disable no-console */
|
|
14
15
|
|
|
15
16
|
async function performLoginSteps({
|
|
@@ -20,7 +21,7 @@ async function performLoginSteps({
|
|
|
20
21
|
}, isLoggedIn) {
|
|
21
22
|
const authFile = _path.default.resolve(_path.default.join((0, _checkAuthCookies.getAuthFileDirectory)(), `${authFilePrefix}-cookies.json`));
|
|
22
23
|
const lockFileName = useremail.replace(/[@.]/g, '_');
|
|
23
|
-
const fileMutex = new _fileMutex.default((0,
|
|
24
|
+
const fileMutex = new _fileMutex.default((0, _checkAuthDirectory.getLockDirectoryPath)(), lockFileName, _fileMutexConfig.LOGIN_MUTEX_TIMEOUT);
|
|
24
25
|
try {
|
|
25
26
|
await fileMutex.acquire();
|
|
26
27
|
await (0, _checkAuthCookies.loadCookiesIfPresent)(page, authFile);
|
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
|
4
5
|
value: true
|
|
5
6
|
});
|
|
6
7
|
exports.createAuthDirectoryIfNotExist = createAuthDirectoryIfNotExist;
|
|
8
|
+
exports.getLockDirectoryPath = getLockDirectoryPath;
|
|
7
9
|
var _fs = require("fs");
|
|
10
|
+
var _path = _interopRequireDefault(require("path"));
|
|
8
11
|
var _checkAuthCookies = require("./auth/checkAuthCookies");
|
|
12
|
+
var _readConfigFile = require("../readConfigFile");
|
|
9
13
|
function createAuthDirectoryIfNotExist() {
|
|
10
14
|
const authDirectory = (0, _checkAuthCookies.getAuthFileDirectory)();
|
|
11
15
|
if (!(0, _fs.existsSync)(authDirectory)) {
|
|
@@ -14,4 +18,10 @@ function createAuthDirectoryIfNotExist() {
|
|
|
14
18
|
recursive: true
|
|
15
19
|
});
|
|
16
20
|
}
|
|
21
|
+
}
|
|
22
|
+
function getLockDirectoryPath() {
|
|
23
|
+
const {
|
|
24
|
+
uatDirectory
|
|
25
|
+
} = (0, _readConfigFile.generateConfigFromFile)();
|
|
26
|
+
return _path.default.resolve(_path.default.join(uatDirectory, 'playwright', '.lock'));
|
|
17
27
|
}
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.default = void 0;
|
|
8
8
|
var _path = _interopRequireDefault(require("path"));
|
|
9
|
-
var
|
|
9
|
+
var _properLockfile = _interopRequireDefault(require("proper-lockfile"));
|
|
10
10
|
var _fs = require("fs");
|
|
11
11
|
function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
|
|
12
12
|
function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
|
|
@@ -14,39 +14,36 @@ function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(
|
|
|
14
14
|
var _getLockFilePath = /*#__PURE__*/new WeakSet();
|
|
15
15
|
var _createDirectoryIfNotExist = /*#__PURE__*/new WeakSet();
|
|
16
16
|
class FileMutex {
|
|
17
|
-
constructor(directory, lockFileName,
|
|
17
|
+
constructor(directory, lockFileName, options = {}) {
|
|
18
18
|
_classPrivateMethodInitSpec(this, _createDirectoryIfNotExist);
|
|
19
19
|
_classPrivateMethodInitSpec(this, _getLockFilePath);
|
|
20
20
|
this.directory = directory;
|
|
21
|
-
this.lockFileName = lockFileName;
|
|
22
|
-
this.
|
|
21
|
+
this.lockFileName = lockFileName + ".lock";
|
|
22
|
+
this.options = options;
|
|
23
23
|
}
|
|
24
24
|
async acquire() {
|
|
25
25
|
_classPrivateMethodGet(this, _createDirectoryIfNotExist, _createDirectoryIfNotExist2).call(this);
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
26
|
+
const lockFilePath = _path.default.resolve(this.directory, this.lockFileName);
|
|
27
|
+
try {
|
|
28
|
+
if (!(0, _fs.existsSync)(lockFilePath)) {
|
|
29
|
+
console.log(`[DEBUG] Creating missing lock file:`, this.lockFileName);
|
|
30
|
+
(0, _fs.writeFileSync)(lockFilePath, 'locked');
|
|
31
|
+
}
|
|
32
|
+
await _properLockfile.default.lock(_classPrivateMethodGet(this, _getLockFilePath, _getLockFilePath2).call(this), this.options);
|
|
33
|
+
} catch (err) {
|
|
34
|
+
throw new Error(`Failed to acquire lock after ${this.options.retries.retries} attempts: ${err.message}`);
|
|
35
|
+
}
|
|
35
36
|
}
|
|
36
37
|
async release() {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
resolve();
|
|
43
|
-
}
|
|
44
|
-
});
|
|
45
|
-
});
|
|
38
|
+
try {
|
|
39
|
+
await _properLockfile.default.unlock(_classPrivateMethodGet(this, _getLockFilePath, _getLockFilePath2).call(this));
|
|
40
|
+
} catch (err) {
|
|
41
|
+
throw new Error(`Failed to release lock: ${err.message}`);
|
|
42
|
+
}
|
|
46
43
|
}
|
|
47
44
|
}
|
|
48
45
|
function _getLockFilePath2() {
|
|
49
|
-
return _path.default.resolve(_path.default.join(this.directory,
|
|
46
|
+
return _path.default.resolve(_path.default.join(this.directory, this.lockFileName));
|
|
50
47
|
}
|
|
51
48
|
function _createDirectoryIfNotExist2() {
|
|
52
49
|
if (!(0, _fs.existsSync)(this.directory)) {
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
class Runner {
|
|
4
|
+
constructor(config) {
|
|
5
|
+
this.tagArgs = "";
|
|
6
|
+
this.userArgs = "";
|
|
7
|
+
this.config = config;
|
|
8
|
+
}
|
|
9
|
+
setUserArgs(userArgs) {
|
|
10
|
+
this.userArgs = userArgs;
|
|
11
|
+
}
|
|
12
|
+
setTagArgs(tagArgs) {
|
|
13
|
+
this.tagArgs = tagArgs;
|
|
14
|
+
}
|
|
15
|
+
setConfig(config) {
|
|
16
|
+
this.config = config;
|
|
17
|
+
}
|
|
18
|
+
run() {
|
|
19
|
+
throw new Error("Method 'run()' must be implemented.");
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
module.exports = Runner;
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
exports.default = void 0;
|
|
8
|
+
var _RunnerTypes = _interopRequireDefault(require("./RunnerTypes"));
|
|
9
|
+
var _configUtils = require("../setup/config-utils");
|
|
10
|
+
var _cliArgsToObject = require("../../../utils/cliArgsToObject");
|
|
11
|
+
var _browserTypes = require("../constants/browserTypes");
|
|
12
|
+
var _customCommands = require("../custom-commands");
|
|
13
|
+
class RunnerHelper {
|
|
14
|
+
static createRunner(type, runnerObj) {
|
|
15
|
+
const runnerClass = _RunnerTypes.default.getRunnerClass(type, runnerObj);
|
|
16
|
+
if (!runnerClass) {
|
|
17
|
+
throw new Error("Invalid runner type");
|
|
18
|
+
}
|
|
19
|
+
return runnerClass;
|
|
20
|
+
}
|
|
21
|
+
static getPlaywrightArgs(userArgsObject, debug, bddMode, tagArgs, headless) {
|
|
22
|
+
const {
|
|
23
|
+
browsers = null
|
|
24
|
+
} = userArgsObject;
|
|
25
|
+
let browserList = (0, _configUtils.getBrowsersList)(browsers);
|
|
26
|
+
const playwrightArgs = (0, _cliArgsToObject.objectToCliArgs)(userArgsObject, key => !_customCommands.CUSTOM_COMMANDS.includes(key));
|
|
27
|
+
if (debug) {
|
|
28
|
+
playwrightArgs.push('--debug');
|
|
29
|
+
}
|
|
30
|
+
if (!bddMode && tagArgs) {
|
|
31
|
+
playwrightArgs.push('--grep');
|
|
32
|
+
playwrightArgs.push(tagArgs);
|
|
33
|
+
}
|
|
34
|
+
if (!headless && !userArgsObject.headed) {
|
|
35
|
+
playwrightArgs.push('--headed');
|
|
36
|
+
}
|
|
37
|
+
if (browserList && browserList.length > 0) {
|
|
38
|
+
browserList.map(browser => playwrightArgs.push(`--project=${_browserTypes.BROWSER_PROJECT_MAPPING[browser.toUpperCase()]}`));
|
|
39
|
+
}
|
|
40
|
+
return playwrightArgs;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
var _default = exports.default = RunnerHelper;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
var _SpawnRunner = _interopRequireDefault(require("./SpawnRunner"));
|
|
5
|
+
class RunnerTypes {
|
|
6
|
+
static getRunnerClass(type, runnerObj) {
|
|
7
|
+
const RunnerClass = this.runnerTypes[type];
|
|
8
|
+
if (!RunnerClass) {
|
|
9
|
+
throw new Error("Invalid runner type");
|
|
10
|
+
}
|
|
11
|
+
return new RunnerClass(runnerObj);
|
|
12
|
+
}
|
|
13
|
+
static runnerTypes = {
|
|
14
|
+
spawn: _SpawnRunner.default //require("./SpawnRunner"), // used lazy loading to reduce circular dependencies
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
module.exports = RunnerTypes;
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
var _readConfigFile = require("../readConfigFile");
|
|
5
|
+
var _rootPath = require("../../../utils/rootPath");
|
|
6
|
+
var _path = _interopRequireDefault(require("path"));
|
|
7
|
+
var _logger = require("../../../utils/logger");
|
|
8
|
+
var _child_process = require("child_process");
|
|
9
|
+
var _RunnerHelper = _interopRequireDefault(require("./RunnerHelper"));
|
|
10
|
+
var _Runner = _interopRequireDefault(require("./Runner"));
|
|
11
|
+
class SpawnRunner extends _Runner.default {
|
|
12
|
+
constructor(runnerObj) {
|
|
13
|
+
super(runnerObj);
|
|
14
|
+
this.runnerObj = runnerObj;
|
|
15
|
+
}
|
|
16
|
+
run() {
|
|
17
|
+
const {
|
|
18
|
+
config
|
|
19
|
+
} = this.runnerObj;
|
|
20
|
+
let promises = [];
|
|
21
|
+
const {
|
|
22
|
+
bddMode
|
|
23
|
+
} = config.getAll();
|
|
24
|
+
if (bddMode) {
|
|
25
|
+
promises.push(this.runPreprocessing());
|
|
26
|
+
}
|
|
27
|
+
Promise.all(promises).then(() => this.runPlaywright()).catch(err => {
|
|
28
|
+
_logger.Logger.error(err);
|
|
29
|
+
process.exit();
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
runPreprocessing() {
|
|
33
|
+
const {
|
|
34
|
+
tagArgs
|
|
35
|
+
} = this.runnerObj;
|
|
36
|
+
const configPath = (0, _readConfigFile.isUserConfigFileAvailable)() ? _path.default.resolve(__dirname, '../', 'setup', 'config-creator.js') : _path.default.resolve('../', '../', '../', '../', 'playwrightConfig.js');
|
|
37
|
+
const beforeCommand = 'node';
|
|
38
|
+
const bddGenPath = _path.default.resolve(__dirname, '../', '../', '../', 'bdd-framework', 'cli', 'index.js');
|
|
39
|
+
const beforeArgs = [bddGenPath, '-c', require.resolve(configPath)];
|
|
40
|
+
if (tagArgs) {
|
|
41
|
+
beforeArgs.push('--tags');
|
|
42
|
+
beforeArgs.push(tagArgs);
|
|
43
|
+
}
|
|
44
|
+
return new Promise((resolve, reject) => {
|
|
45
|
+
const childProcessForPreprocessing = (0, _child_process.spawn)(beforeCommand, beforeArgs, {
|
|
46
|
+
stdio: 'inherit',
|
|
47
|
+
env: {
|
|
48
|
+
...process.env
|
|
49
|
+
}
|
|
50
|
+
});
|
|
51
|
+
childProcessForPreprocessing.on('error', data => {
|
|
52
|
+
_logger.Logger.log(_logger.Logger.FAILURE_TYPE, data);
|
|
53
|
+
reject(data);
|
|
54
|
+
});
|
|
55
|
+
childProcessForPreprocessing.on('exit', code => {
|
|
56
|
+
if (code === 0) {
|
|
57
|
+
_logger.Logger.log(_logger.Logger.SUCCESS_TYPE, 'Feature Files Processed Successfully');
|
|
58
|
+
resolve();
|
|
59
|
+
} else {
|
|
60
|
+
reject(`BddGen exited with code ${code}`);
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
runPlaywright() {
|
|
66
|
+
const {
|
|
67
|
+
tagArgs,
|
|
68
|
+
config,
|
|
69
|
+
userArgs
|
|
70
|
+
} = this.runnerObj;
|
|
71
|
+
const {
|
|
72
|
+
debug,
|
|
73
|
+
bddMode = false,
|
|
74
|
+
headless = false
|
|
75
|
+
} = config.getAll();
|
|
76
|
+
const playwrightArgs = _RunnerHelper.default.getPlaywrightArgs(userArgs, debug, bddMode, tagArgs, headless);
|
|
77
|
+
const playwrightPath = _path.default.resolve((0, _rootPath.getExecutableBinaryPath)('playwright'));
|
|
78
|
+
const command = playwrightPath;
|
|
79
|
+
const configPath = (0, _readConfigFile.isUserConfigFileAvailable)() ? _path.default.resolve(__dirname, '../', 'setup', 'config-creator.js') : _path.default.resolve('../', '../', '../', '../', 'playwrightConfig.js');
|
|
80
|
+
const args = ['test', '--config', require.resolve(configPath)].concat(playwrightArgs);
|
|
81
|
+
return new Promise((resolve, reject) => {
|
|
82
|
+
const childProcessForRunningPlaywright = (0, _child_process.spawn)(command, args, {
|
|
83
|
+
stdio: 'inherit',
|
|
84
|
+
env: {
|
|
85
|
+
...process.env
|
|
86
|
+
}
|
|
87
|
+
});
|
|
88
|
+
childProcessForRunningPlaywright.on('error', error => {
|
|
89
|
+
_logger.Logger.log(_logger.Logger.FAILURE_TYPE, error);
|
|
90
|
+
});
|
|
91
|
+
childProcessForRunningPlaywright.on('exit', (code, signal) => {
|
|
92
|
+
if (code !== 0) {
|
|
93
|
+
reject(`Child Process Exited with Code ${code} and Signal ${signal}`);
|
|
94
|
+
} else {
|
|
95
|
+
_logger.Logger.log(_logger.Logger.SUCCESS_TYPE, 'Test Ran Successfully');
|
|
96
|
+
resolve();
|
|
97
|
+
}
|
|
98
|
+
});
|
|
99
|
+
process.on('exit', () => {
|
|
100
|
+
childProcessForRunningPlaywright.kill();
|
|
101
|
+
reject('Terminating Playwright Process...');
|
|
102
|
+
});
|
|
103
|
+
process.on('SIGINT', () => {
|
|
104
|
+
childProcessForRunningPlaywright.kill();
|
|
105
|
+
reject('Cleaning up...');
|
|
106
|
+
});
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
module.exports = SpawnRunner;
|
|
@@ -20,27 +20,8 @@ var _browserTypes = require("./constants/browserTypes");
|
|
|
20
20
|
var _ConfigurationHelper = require("./configuration/ConfigurationHelper");
|
|
21
21
|
var _Configuration = _interopRequireDefault(require("./configuration/Configuration"));
|
|
22
22
|
var _UserArgs = _interopRequireDefault(require("./configuration/UserArgs"));
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
browsers = null
|
|
26
|
-
} = userArgsObject;
|
|
27
|
-
let browserList = (0, _configUtils.getBrowsersList)(browsers);
|
|
28
|
-
const playwrightArgs = (0, _cliArgsToObject.objectToCliArgs)(userArgsObject, key => !_customCommands.CUSTOM_COMMANDS.includes(key));
|
|
29
|
-
if (debug) {
|
|
30
|
-
playwrightArgs.push('--debug');
|
|
31
|
-
}
|
|
32
|
-
if (!bddMode && tagArgs) {
|
|
33
|
-
playwrightArgs.push('--grep');
|
|
34
|
-
playwrightArgs.push(tagArgs);
|
|
35
|
-
}
|
|
36
|
-
if (!headless && !userArgsObject.headed) {
|
|
37
|
-
playwrightArgs.push('--headed');
|
|
38
|
-
}
|
|
39
|
-
if (browserList && browserList.length > 0) {
|
|
40
|
-
browserList.map(browser => playwrightArgs.push(`--project=${_browserTypes.BROWSER_PROJECT_MAPPING[browser.toUpperCase()]}`));
|
|
41
|
-
}
|
|
42
|
-
return playwrightArgs;
|
|
43
|
-
}
|
|
23
|
+
var _RunnerHelper = _interopRequireDefault(require("./runner/RunnerHelper"));
|
|
24
|
+
var _Runner = _interopRequireDefault(require("./runner/Runner"));
|
|
44
25
|
function runPreprocessing(tagArgs, configPath) {
|
|
45
26
|
const beforeCommand = 'node';
|
|
46
27
|
const bddGenPath = _path.default.resolve(__dirname, '../', '../', 'bdd-framework', 'cli', 'index.js');
|
|
@@ -124,18 +105,11 @@ function main() {
|
|
|
124
105
|
const userArgsObject = userArgConfig.getAll();
|
|
125
106
|
const tagProcessor = new _tagProcessor.default(editionOrder);
|
|
126
107
|
const tagArgs = tagProcessor.processTags(userArgsObject);
|
|
127
|
-
const
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
const
|
|
132
|
-
|
|
133
|
-
if (bddMode) {
|
|
134
|
-
promises.push(runPreprocessing(tagArgs, configPath));
|
|
135
|
-
}
|
|
136
|
-
Promise.all(promises).then(() => runPlaywright(command, args)).catch(err => {
|
|
137
|
-
_logger.Logger.error(err);
|
|
138
|
-
process.exit();
|
|
139
|
-
});
|
|
108
|
+
const runnerObj = new _Runner.default();
|
|
109
|
+
runnerObj.setTagArgs(tagArgs);
|
|
110
|
+
runnerObj.setUserArgs(userArgsObject);
|
|
111
|
+
runnerObj.setConfig(uatConfig);
|
|
112
|
+
const runner = _RunnerHelper.default.createRunner('spawn', runnerObj);
|
|
113
|
+
runner.run();
|
|
140
114
|
}
|
|
141
115
|
var _default = exports.default = main;
|
|
@@ -2,93 +2,70 @@
|
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
4
|
var _fileMutex = _interopRequireDefault(require("../../../../../core/playwright/helpers/fileMutex"));
|
|
5
|
-
var
|
|
5
|
+
var _properLockfile = _interopRequireDefault(require("proper-lockfile"));
|
|
6
6
|
var _path = _interopRequireDefault(require("path"));
|
|
7
7
|
var _fs = _interopRequireDefault(require("fs"));
|
|
8
|
-
jest.mock('lockfile');
|
|
8
|
+
jest.mock('proper-lockfile');
|
|
9
9
|
jest.mock('fs');
|
|
10
10
|
describe('FileMutex', () => {
|
|
11
|
-
const
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
retries:
|
|
16
|
-
|
|
11
|
+
const directory = '/tmp/locks';
|
|
12
|
+
const lockFileName = 'test-lock';
|
|
13
|
+
const options = {
|
|
14
|
+
stale: 10000,
|
|
15
|
+
retries: {
|
|
16
|
+
retries: 5,
|
|
17
|
+
factor: 1,
|
|
18
|
+
minTimeout: 5000,
|
|
19
|
+
maxTimeout: 8000
|
|
20
|
+
}
|
|
17
21
|
};
|
|
22
|
+
const lockFilePath = _path.default.resolve(directory, lockFileName + '.lock');
|
|
18
23
|
let fileMutex;
|
|
19
24
|
beforeEach(() => {
|
|
20
|
-
fileMutex = new _fileMutex.default(
|
|
21
|
-
});
|
|
22
|
-
afterEach(() => {
|
|
25
|
+
fileMutex = new _fileMutex.default(directory, lockFileName, options);
|
|
23
26
|
jest.clearAllMocks();
|
|
24
27
|
});
|
|
25
28
|
describe('acquire', () => {
|
|
26
|
-
it('should
|
|
27
|
-
const expectedPath = _path.default.resolve(_path.default.join(mockDirectory, `./${mockFileName}.lock`));
|
|
28
|
-
_lockfile.default.lock.mockImplementation((lockPath, options, callback) => {
|
|
29
|
-
expect(lockPath).toBe(expectedPath);
|
|
30
|
-
expect(options).toEqual(mockTimeout);
|
|
31
|
-
callback(null);
|
|
32
|
-
});
|
|
33
|
-
await expect(fileMutex.acquire()).resolves.toBeUndefined();
|
|
34
|
-
expect(_lockfile.default.lock).toHaveBeenCalledWith(expectedPath, mockTimeout, expect.any(Function));
|
|
35
|
-
});
|
|
36
|
-
it('should reject when lockfile.lock fails', async () => {
|
|
37
|
-
const mockError = new Error('Lock failed');
|
|
38
|
-
_lockfile.default.lock.mockImplementation((lockPath, options, callback) => {
|
|
39
|
-
expect(lockPath).toBe(_path.default.resolve(_path.default.join(mockDirectory, `./${mockFileName}.lock`)));
|
|
40
|
-
expect(options).toEqual(mockTimeout);
|
|
41
|
-
callback(mockError);
|
|
42
|
-
});
|
|
43
|
-
await expect(fileMutex.acquire()).rejects.toThrow('Lock failed');
|
|
44
|
-
expect(_lockfile.default.lock).toHaveBeenCalled();
|
|
45
|
-
});
|
|
46
|
-
it('should create the directory if it does not exist and acquire the lock', async () => {
|
|
29
|
+
it('should create the directory if it does not exist', async () => {
|
|
47
30
|
_fs.default.existsSync.mockReturnValue(false);
|
|
48
|
-
_fs.default.mkdirSync.mockImplementation((
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
});
|
|
54
|
-
_lockfile.default.lock.mockImplementation((lockPath, options, callback) => {
|
|
55
|
-
expect(lockPath).toBe(_path.default.resolve(_path.default.join(mockDirectory, `./${mockFileName}.lock`)));
|
|
56
|
-
expect(options).toEqual(mockTimeout);
|
|
57
|
-
callback(null);
|
|
58
|
-
});
|
|
59
|
-
await expect(fileMutex.acquire()).resolves.toBeUndefined();
|
|
60
|
-
expect(_fs.default.existsSync).toHaveBeenCalledWith(mockDirectory);
|
|
61
|
-
expect(_fs.default.mkdirSync).toHaveBeenCalledWith(mockDirectory, {
|
|
31
|
+
_fs.default.mkdirSync.mockImplementation(() => {});
|
|
32
|
+
_properLockfile.default.lock.mockResolvedValue();
|
|
33
|
+
await fileMutex.acquire();
|
|
34
|
+
expect(_fs.default.existsSync).toHaveBeenCalledWith(directory);
|
|
35
|
+
expect(_fs.default.mkdirSync).toHaveBeenCalledWith(directory, {
|
|
62
36
|
recursive: true
|
|
63
37
|
});
|
|
64
|
-
expect(_lockfile.default.lock).toHaveBeenCalled();
|
|
65
38
|
});
|
|
66
|
-
it('should
|
|
39
|
+
it('should create the lock file if it does not exist', async () => {
|
|
40
|
+
_fs.default.existsSync.mockImplementation(filePath => filePath !== lockFilePath);
|
|
41
|
+
_fs.default.writeFileSync.mockImplementation(() => {});
|
|
42
|
+
_properLockfile.default.lock.mockResolvedValue();
|
|
43
|
+
await fileMutex.acquire();
|
|
44
|
+
expect(_fs.default.existsSync).toHaveBeenCalledWith(lockFilePath);
|
|
45
|
+
expect(_fs.default.writeFileSync).toHaveBeenCalledWith(lockFilePath, 'locked');
|
|
46
|
+
});
|
|
47
|
+
it('should acquire the lock using proper-lockfile', async () => {
|
|
67
48
|
_fs.default.existsSync.mockReturnValue(true);
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
49
|
+
_properLockfile.default.lock.mockResolvedValue();
|
|
50
|
+
await fileMutex.acquire();
|
|
51
|
+
expect(_properLockfile.default.lock).toHaveBeenCalledWith(lockFilePath, options);
|
|
52
|
+
});
|
|
53
|
+
it('should throw an error if lock acquisition fails', async () => {
|
|
54
|
+
const errorMessage = 'Lock acquisition failed';
|
|
55
|
+
_properLockfile.default.lock.mockRejectedValue(new Error(errorMessage));
|
|
56
|
+
await expect(fileMutex.acquire()).rejects.toThrow(`Failed to acquire lock after ${options.retries.retries} attempts: ${errorMessage}`);
|
|
74
57
|
});
|
|
75
58
|
});
|
|
76
59
|
describe('release', () => {
|
|
77
|
-
it('should
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
});
|
|
82
|
-
await expect(fileMutex.release()).resolves.toBeUndefined();
|
|
83
|
-
expect(_lockfile.default.unlock).toHaveBeenCalledWith(expectedPath, expect.any(Function));
|
|
60
|
+
it('should release the lock using proper-lockfile', async () => {
|
|
61
|
+
_properLockfile.default.unlock.mockResolvedValue();
|
|
62
|
+
await fileMutex.release();
|
|
63
|
+
expect(_properLockfile.default.unlock).toHaveBeenCalledWith(lockFilePath);
|
|
84
64
|
});
|
|
85
|
-
it('should
|
|
86
|
-
const
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
});
|
|
90
|
-
await expect(fileMutex.release()).rejects.toThrow('Unlock failed');
|
|
91
|
-
expect(_lockfile.default.unlock).toHaveBeenCalled();
|
|
65
|
+
it('should throw an error if lock release fails', async () => {
|
|
66
|
+
const errorMessage = 'Lock release failed';
|
|
67
|
+
_properLockfile.default.unlock.mockRejectedValue(new Error(errorMessage));
|
|
68
|
+
await expect(fileMutex.release()).rejects.toThrow(`Failed to release lock: ${errorMessage}`);
|
|
92
69
|
});
|
|
93
70
|
});
|
|
94
71
|
});
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
var _RunnerHelper = _interopRequireDefault(require("../../../../../core/playwright/runner/RunnerHelper"));
|
|
5
|
+
var _SpawnRunner = _interopRequireDefault(require("../../../../../core/playwright/runner/SpawnRunner"));
|
|
6
|
+
describe('RunnerHelper', () => {
|
|
7
|
+
describe('createRunner', () => {
|
|
8
|
+
it('should throw error on invalid runner type', () => {
|
|
9
|
+
expect(() => _RunnerHelper.default.createRunner('invalid-type', {})).toThrow("Invalid runner type");
|
|
10
|
+
});
|
|
11
|
+
it('should create a valid runner class', () => {
|
|
12
|
+
const runnerInstance = _RunnerHelper.default.createRunner('spawn', {});
|
|
13
|
+
expect(runnerInstance).toBeInstanceOf(_SpawnRunner.default); // Directly pass the result
|
|
14
|
+
});
|
|
15
|
+
});
|
|
16
|
+
});
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
var _RunnerHelper = _interopRequireDefault(require("../../../../../core/playwright/runner/RunnerHelper"));
|
|
5
|
+
var _Runner = _interopRequireDefault(require("../../../../../core/playwright/runner/Runner"));
|
|
6
|
+
var _Configuration = _interopRequireDefault(require("../../../../../core/playwright/configuration/Configuration"));
|
|
7
|
+
jest.mock('child_process');
|
|
8
|
+
jest.mock('../../../../../utils/logger');
|
|
9
|
+
describe('SpawnRunner', () => {
|
|
10
|
+
let spawnRunner;
|
|
11
|
+
const runnerObj = new _Runner.default();
|
|
12
|
+
beforeEach(() => {
|
|
13
|
+
const config = new _Configuration.default({});
|
|
14
|
+
config.add("bddMode", true);
|
|
15
|
+
runnerObj.setConfig(config);
|
|
16
|
+
runnerObj.setTagArgs(["--headed"]);
|
|
17
|
+
spawnRunner = _RunnerHelper.default.createRunner('spawn', runnerObj);
|
|
18
|
+
});
|
|
19
|
+
describe('run', () => {
|
|
20
|
+
it('should call runPreprocessing when bddMode is true', () => {
|
|
21
|
+
const runPreprocessingSpy = jest.spyOn(spawnRunner, 'runPreprocessing').mockResolvedValue();
|
|
22
|
+
const runPlaywrightSpy = jest.spyOn(spawnRunner, 'runPlaywright').mockResolvedValue();
|
|
23
|
+
spawnRunner.run();
|
|
24
|
+
expect(runPreprocessingSpy).toHaveBeenCalled();
|
|
25
|
+
});
|
|
26
|
+
});
|
|
27
|
+
});
|
package/nobdd/uat.config.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zohodesk/testinglibrary",
|
|
3
|
-
"version": "2.9.
|
|
3
|
+
"version": "2.9.3",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "./build/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
"fast-glob": "3.3.1",
|
|
33
33
|
"jest": "29.6.2",
|
|
34
34
|
"jest-environment-jsdom": "29.6.2",
|
|
35
|
-
"lockfile": "^1.0.4",
|
|
36
35
|
"msw": "1.2.3",
|
|
37
36
|
"playwright": "1.42.1",
|
|
37
|
+
"proper-lockfile": "4.1.2",
|
|
38
38
|
"supports-color": "8.1.1"
|
|
39
39
|
},
|
|
40
40
|
"bin": {
|