@zohodesk/testinglibrary 0.4.45-experimental → 0.4.47-experimental
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 +12 -20
- package/README.md +54 -1
- package/build/core/playwright/builtInFixtures/page.js +44 -46
- package/build/core/playwright/clear-caches.js +7 -0
- package/build/core/playwright/constants/fileMutexConfig.js +4 -3
- package/build/core/playwright/custom-commands.js +1 -1
- package/build/core/playwright/fixtures.js +24 -0
- package/build/core/playwright/helpers/auth/loginSteps.js +20 -25
- package/build/core/playwright/helpers/configFileNameProvider.js +1 -1
- package/build/core/playwright/helpers/fileMutex.js +11 -13
- package/build/core/playwright/index.js +10 -23
- package/build/core/playwright/runner/SpawnRunner.js +2 -2
- package/build/core/playwright/setup/config-creator.js +15 -8
- package/build/core/playwright/setup/config-utils.js +8 -25
- package/build/core/playwright/tagProcessor.js +18 -28
- package/build/core/playwright/test-runner.js +1 -1
- package/build/decorators.d.ts +1 -1
- package/build/decorators.js +1 -1
- package/build/setup-folder-structure/samples/accountLogin-sample.js +19 -0
- package/build/setup-folder-structure/samples/auth-setup-sample.js +10 -68
- package/build/setup-folder-structure/samples/editions-index.js +3 -0
- package/build/setup-folder-structure/samples/free-sample.json +25 -0
- package/{nobdd/uat/conf/default → build/setup-folder-structure/samples}/settings.json +4 -3
- package/build/setup-folder-structure/samples/testSetup-sample.js +14 -0
- package/build/setup-folder-structure/samples/uat-config-sample.js +3 -1
- package/build/setup-folder-structure/setupProject.js +22 -5
- package/build/test/core/playwright/helpers/__tests__/configFileNameProvider.test.js +1 -1
- package/npm-shrinkwrap.json +7624 -3344
- package/package.json +12 -11
- package/playwright.config.js +0 -48
- package/build/bdd-framework/cli/commands/env.js +0 -42
- package/build/bdd-framework/cli/commands/export.js +0 -62
- package/build/bdd-framework/cli/commands/test.js +0 -64
- package/build/bdd-framework/cli/index.js +0 -11
- package/build/bdd-framework/cli/options.js +0 -19
- package/build/bdd-framework/cli/worker.js +0 -13
- package/build/bdd-framework/config/configDir.js +0 -35
- package/build/bdd-framework/config/enrichReporterData.js +0 -23
- package/build/bdd-framework/config/env.js +0 -50
- package/build/bdd-framework/config/index.js +0 -94
- package/build/bdd-framework/config/lang.js +0 -14
- package/build/bdd-framework/cucumber/buildStepDefinition.js +0 -43
- package/build/bdd-framework/cucumber/createTestStep.js +0 -43
- package/build/bdd-framework/cucumber/formatter/EventDataCollector.js +0 -126
- package/build/bdd-framework/cucumber/formatter/GherkinDocumentParser.js +0 -72
- package/build/bdd-framework/cucumber/formatter/PickleParser.js +0 -25
- package/build/bdd-framework/cucumber/formatter/durationHelpers.js +0 -13
- package/build/bdd-framework/cucumber/formatter/getColorFns.js +0 -57
- package/build/bdd-framework/cucumber/formatter/index.js +0 -16
- package/build/bdd-framework/cucumber/formatter/locationHelpers.js +0 -16
- package/build/bdd-framework/cucumber/loadConfig.js +0 -17
- package/build/bdd-framework/cucumber/loadFeatures.js +0 -70
- package/build/bdd-framework/cucumber/loadSnippetBuilder.js +0 -20
- package/build/bdd-framework/cucumber/loadSteps.js +0 -47
- package/build/bdd-framework/cucumber/resolveFeaturePaths.js +0 -62
- package/build/bdd-framework/cucumber/stepArguments.js +0 -21
- package/build/bdd-framework/cucumber/types.js +0 -5
- package/build/bdd-framework/cucumber/valueChecker.js +0 -23
- package/build/bdd-framework/decorators.js +0 -18
- package/build/bdd-framework/gen/fixtures.js +0 -48
- package/build/bdd-framework/gen/formatter.js +0 -167
- package/build/bdd-framework/gen/i18n.js +0 -39
- package/build/bdd-framework/gen/index.js +0 -197
- package/build/bdd-framework/gen/specialTags.js +0 -70
- package/build/bdd-framework/gen/testFile.js +0 -470
- package/build/bdd-framework/gen/testMeta.js +0 -60
- package/build/bdd-framework/gen/testNode.js +0 -35
- package/build/bdd-framework/gen/testPoms.js +0 -133
- package/build/bdd-framework/hooks/scenario.js +0 -130
- package/build/bdd-framework/hooks/worker.js +0 -89
- package/build/bdd-framework/index.js +0 -52
- package/build/bdd-framework/playwright/fixtureParameterNames.js +0 -93
- package/build/bdd-framework/playwright/getLocationInFile.js +0 -79
- package/build/bdd-framework/playwright/loadConfig.js +0 -42
- package/build/bdd-framework/playwright/loadUtils.js +0 -33
- package/build/bdd-framework/playwright/testTypeImpl.js +0 -79
- package/build/bdd-framework/playwright/transform.js +0 -88
- package/build/bdd-framework/playwright/types.js +0 -12
- package/build/bdd-framework/playwright/utils.js +0 -56
- package/build/bdd-framework/reporter/cucumber/base.js +0 -52
- package/build/bdd-framework/reporter/cucumber/custom.js +0 -73
- package/build/bdd-framework/reporter/cucumber/helper.js +0 -12
- package/build/bdd-framework/reporter/cucumber/html.js +0 -40
- package/build/bdd-framework/reporter/cucumber/index.js +0 -74
- package/build/bdd-framework/reporter/cucumber/json.js +0 -312
- package/build/bdd-framework/reporter/cucumber/junit.js +0 -205
- package/build/bdd-framework/reporter/cucumber/message.js +0 -20
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/AttachmentMapper.js +0 -82
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/Builder.js +0 -197
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/GherkinDocument.js +0 -43
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/GherkinDocumentClone.js +0 -52
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/GherkinDocuments.js +0 -105
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/Hook.js +0 -70
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/Meta.js +0 -45
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/Pickles.js +0 -27
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/Projects.js +0 -38
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/TestCase.js +0 -128
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/TestCaseRun.js +0 -154
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/TestCaseRunHooks.js +0 -123
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/TestStepAttachments.js +0 -67
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/TestStepRun.js +0 -114
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/index.js +0 -30
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/pwStepUtils.js +0 -70
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/timing.js +0 -35
- package/build/bdd-framework/reporter/cucumber/messagesBuilder/types.js +0 -5
- package/build/bdd-framework/run/StepInvoker.js +0 -69
- package/build/bdd-framework/run/bddData/index.js +0 -59
- package/build/bdd-framework/run/bddData/types.js +0 -5
- package/build/bdd-framework/run/bddFixtures.js +0 -192
- package/build/bdd-framework/run/bddWorld.js +0 -79
- package/build/bdd-framework/run/bddWorldInternal.js +0 -11
- package/build/bdd-framework/snippets/index.js +0 -132
- package/build/bdd-framework/snippets/snippetSyntax.js +0 -43
- package/build/bdd-framework/snippets/snippetSyntaxDecorators.js +0 -26
- package/build/bdd-framework/snippets/snippetSyntaxTs.js +0 -18
- package/build/bdd-framework/stepDefinitions/createBdd.js +0 -66
- package/build/bdd-framework/stepDefinitions/decorators/class.js +0 -68
- package/build/bdd-framework/stepDefinitions/decorators/steps.js +0 -99
- package/build/bdd-framework/stepDefinitions/defineStep.js +0 -62
- package/build/bdd-framework/stepDefinitions/stepConfig.js +0 -24
- package/build/bdd-framework/steps/createBdd.js +0 -78
- package/build/bdd-framework/steps/decorators/class.js +0 -68
- package/build/bdd-framework/steps/decorators/steps.js +0 -98
- package/build/bdd-framework/steps/defineStep.js +0 -62
- package/build/bdd-framework/steps/stepConfig.js +0 -24
- package/build/bdd-framework/utils/AutofillMap.js +0 -20
- package/build/bdd-framework/utils/exit.js +0 -62
- package/build/bdd-framework/utils/index.js +0 -93
- package/build/bdd-framework/utils/jsStringWrap.js +0 -44
- package/build/bdd-framework/utils/logger.js +0 -30
- package/build/bdd-framework/utils/stripAnsiEscapes.js +0 -20
- package/build/setup-folder-structure/samples/authUsers-sample.json +0 -9
- package/build/setup-folder-structure/samples/env-config-sample.json +0 -21
- package/nobdd/README.md +0 -1
- package/nobdd/package.json +0 -17
- package/nobdd/src/App.js +0 -7
- package/nobdd/uat/conf/default/actors/editions/enterprise.json +0 -24
- package/nobdd/uat/conf/default/actors/editions/index.js +0 -4
- package/nobdd/uat/conf/nobdd/uat.config.js +0 -36
- package/nobdd/uat/env-config.json +0 -20
- package/nobdd/uat/fixtures/auth.setup.js +0 -44
- package/nobdd/uat/fixtures/setup.teardown.js +0 -33
- package/nobdd/uat/modules/nobdd/steps/VerifyNoBDD.feature.spec.js +0 -16
- package/nobdd/uat/shared/commands/_index-custom-fixtures.js +0 -9
- package/nobdd/uat/shared/commands/i18n.js +0 -25
- package/nobdd/uat/shared/commands/unauthenticatedPage.js +0 -8
- package/nobdd/uat/shared/index.js +0 -7
- package/nobdd/uat/shared/onboardings/onboardingUpdate.js +0 -44
- package/nobdd/uat/shared/url-helpers/getUrlOrigin.js +0 -6
- package/nobdd/uat.config.js +0 -37
- /package/{nobdd/uat/conf/default/actors/index.js → build/setup-folder-structure/samples/actors-index.js} +0 -0
package/.gitlab-ci.yml
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:
|
|
1
|
+
image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v3
|
|
2
2
|
|
|
3
3
|
workflow:
|
|
4
4
|
rules:
|
|
@@ -18,14 +18,19 @@ default:
|
|
|
18
18
|
paths:
|
|
19
19
|
- node_modules
|
|
20
20
|
- build
|
|
21
|
+
- npm-shrinkwrap.json
|
|
21
22
|
|
|
22
23
|
# Install dependencies stage
|
|
23
24
|
build:
|
|
24
25
|
stage: build
|
|
25
26
|
script:
|
|
27
|
+
- npm -v
|
|
28
|
+
- node -v
|
|
26
29
|
- npm install --ignore-scripts
|
|
27
30
|
- npm run build
|
|
28
31
|
- npm install
|
|
32
|
+
- npm shrinkwrap
|
|
33
|
+
- npm run build
|
|
29
34
|
|
|
30
35
|
# Unit tests stage
|
|
31
36
|
unit:
|
|
@@ -45,9 +50,7 @@ uat-auth:
|
|
|
45
50
|
- npm install $(npm pack ../../testing-framework | tail -1)
|
|
46
51
|
- output=$(npm run uatauth)
|
|
47
52
|
- echo "$output"
|
|
48
|
-
-
|
|
49
|
-
- exit 1
|
|
50
|
-
- fi
|
|
53
|
+
- node ../ValidateUATReport.js examples
|
|
51
54
|
|
|
52
55
|
artifacts:
|
|
53
56
|
when: always
|
|
@@ -61,9 +64,7 @@ uat-noauth:
|
|
|
61
64
|
- npm install $(npm pack ../../testing-framework | tail -1)
|
|
62
65
|
- output=$(npm run uatnoauth)
|
|
63
66
|
- echo "$output"
|
|
64
|
-
-
|
|
65
|
-
- exit 1
|
|
66
|
-
- fi
|
|
67
|
+
- node ../ValidateUATReport.js examples
|
|
67
68
|
|
|
68
69
|
artifacts:
|
|
69
70
|
when: always
|
|
@@ -77,9 +78,7 @@ uat-profile:
|
|
|
77
78
|
- npm install $(npm pack ../../testing-framework | tail -1)
|
|
78
79
|
- output=$(npm run uatprofile)
|
|
79
80
|
- echo "$output"
|
|
80
|
-
-
|
|
81
|
-
- exit 1
|
|
82
|
-
- fi
|
|
81
|
+
- node ../ValidateUATReport.js examples
|
|
83
82
|
|
|
84
83
|
artifacts:
|
|
85
84
|
when: always
|
|
@@ -89,17 +88,12 @@ uat-profile:
|
|
|
89
88
|
|
|
90
89
|
uat-unauth:
|
|
91
90
|
stage: uat
|
|
92
|
-
image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v2
|
|
93
91
|
script:
|
|
94
|
-
- npm install
|
|
95
|
-
- npm run build
|
|
96
92
|
- cd examples
|
|
97
93
|
- npm install $(npm pack ../../testing-framework | tail -1)
|
|
98
94
|
- output=$(npm run uatunauth)
|
|
99
95
|
- echo "$output"
|
|
100
|
-
-
|
|
101
|
-
- exit 1
|
|
102
|
-
- fi
|
|
96
|
+
- node ../ValidateUATReport.js examples
|
|
103
97
|
|
|
104
98
|
|
|
105
99
|
artifacts:
|
|
@@ -112,11 +106,9 @@ uat-nobdd:
|
|
|
112
106
|
script:
|
|
113
107
|
- cd nobdd
|
|
114
108
|
- npm install $(npm pack ../../testing-framework | tail -1)
|
|
115
|
-
- output=$(npm run uatnobdd)
|
|
109
|
+
- output=$(npm run uatnobdd -- --headless)
|
|
116
110
|
- echo "$output"
|
|
117
|
-
-
|
|
118
|
-
- exit 1
|
|
119
|
-
- fi
|
|
111
|
+
- node ../ValidateUATReport.js nobdd
|
|
120
112
|
|
|
121
113
|
|
|
122
114
|
artifacts:
|
package/README.md
CHANGED
|
@@ -26,13 +26,66 @@
|
|
|
26
26
|
### Bug fix
|
|
27
27
|
- Updated the custom-reported to include the errors in tests during the executions. It will help us avoid the stage passed without the actual test execution.
|
|
28
28
|
|
|
29
|
-
|
|
29
|
+
|
|
30
|
+
## Version History
|
|
31
|
+
|
|
32
|
+
### v3.0.8 - 25-12-2024
|
|
33
|
+
|
|
34
|
+
#### Enhancement
|
|
35
|
+
- Added support to disable headless mode using command line arguments
|
|
36
|
+
- Proper validation added for node 14 build process
|
|
37
|
+
- Removed unwanted uat.config.js files in test projects (examples / nobdd)
|
|
38
|
+
|
|
39
|
+
### v0.2.9.2 - 22-11-2024
|
|
40
|
+
|
|
41
|
+
#### BugFix
|
|
42
|
+
- Implemented synchronization for the login process. This fix will help avoid login session-related failures in UAT.
|
|
43
|
+
|
|
44
|
+
### v0.3.1 - 13-11-2024
|
|
45
|
+
|
|
46
|
+
#### Issue Fix
|
|
47
|
+
- Adding bddmode to get the fixtures.
|
|
48
|
+
|
|
49
|
+
### v0.2.9.1 - 14-11-2024
|
|
50
|
+
|
|
51
|
+
#### Enhancement
|
|
52
|
+
- Beta feature Actors and edition configurations are unified
|
|
53
|
+
|
|
54
|
+
### v0.2.9 - 25-10-2024
|
|
30
55
|
|
|
31
56
|
#### Feature
|
|
32
57
|
- Added support for scenario level tag support
|
|
33
58
|
- Added a new cli optin like uat-validate to validate the feature files using playwright-bdd
|
|
34
59
|
- Mode based configuration implementations
|
|
35
60
|
- @only option enabled in dev pipeline
|
|
61
|
+
- Latest setup related configuration changed for init option
|
|
62
|
+
|
|
63
|
+
### v0.3.0 - 25-10-2024
|
|
64
|
+
|
|
65
|
+
#### Features
|
|
66
|
+
- Added support for scenario level tag support
|
|
67
|
+
- Updated the configuration for `video` and `trace` to accept Playwright-specific values instead of boolean values.
|
|
68
|
+
- Below package versions are updated in this release.
|
|
69
|
+
- playwright - 1.48.0,
|
|
70
|
+
- playwright-bdd - 7.5.0,
|
|
71
|
+
- @playwright/test - 1.48.0,
|
|
72
|
+
- @cucumber/cucumber - 11.0.1
|
|
73
|
+
- From this version, We adopt the playwright-bdd as library instead of modified source
|
|
74
|
+
- Published on 11-11-2024
|
|
75
|
+
|
|
76
|
+
#### Deprecations
|
|
77
|
+
- **Deprecated**: Passing `video` and `trace` as boolean (`true`/`false`) in project configuration.
|
|
78
|
+
- **New Approach**: Use Playwright values for `video` and `trace` options, such as `'on'`, `'retain-on-failure'`, or `'off'`.
|
|
79
|
+
|
|
80
|
+
### v0.3.1 - 13-11-2024
|
|
81
|
+
|
|
82
|
+
#### Issue Fix
|
|
83
|
+
- Adding bddmode to get the fixtures.
|
|
84
|
+
|
|
85
|
+
### v0.3.3 - 27-11-2024
|
|
86
|
+
|
|
87
|
+
#### Feature
|
|
88
|
+
- Custom report integration support (ReportPortal)
|
|
36
89
|
|
|
37
90
|
### v0.2.9.1 - 14-11-2024
|
|
38
91
|
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
3
|
Object.defineProperty(exports, "__esModule", {
|
|
5
4
|
value: true
|
|
6
5
|
});
|
|
7
6
|
exports.default = void 0;
|
|
8
7
|
var _auth = require("../helpers/auth");
|
|
9
|
-
var _getUrlOrigin = _interopRequireDefault(require("../helpers/auth/getUrlOrigin"));
|
|
10
8
|
var _readConfigFile = require("../readConfigFile");
|
|
11
9
|
/* eslint-disable global-require */
|
|
12
10
|
|
|
@@ -34,6 +32,16 @@ function getCustomAccountDetails(tags) {
|
|
|
34
32
|
const {
|
|
35
33
|
testSetup
|
|
36
34
|
} = (0, _readConfigFile.generateConfigFromFile)();
|
|
35
|
+
async function loginSteps(pageDetail) {
|
|
36
|
+
const {
|
|
37
|
+
page
|
|
38
|
+
} = pageDetail;
|
|
39
|
+
if (testSetup.loginSteps && typeof testSetup.loginSteps === 'function') {
|
|
40
|
+
return await testSetup.loginSteps(pageDetail);
|
|
41
|
+
} else {
|
|
42
|
+
await page.goto(process.env.domain);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
37
45
|
async function performDefaultPageSteps({
|
|
38
46
|
context,
|
|
39
47
|
$tags,
|
|
@@ -49,13 +57,11 @@ async function performDefaultPageSteps({
|
|
|
49
57
|
await page.goto(process.env.domain);
|
|
50
58
|
}
|
|
51
59
|
}
|
|
52
|
-
async function verifyPageIsLoaded(
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
if (urlOrigin === domainOrigin) {
|
|
56
|
-
return true;
|
|
60
|
+
async function verifyPageIsLoaded(testInfo) {
|
|
61
|
+
if (testSetup.validateLogin && typeof testSetup.validateLogin === 'function') {
|
|
62
|
+
return await testSetup.validateLogin(testInfo);
|
|
57
63
|
}
|
|
58
|
-
return
|
|
64
|
+
return true;
|
|
59
65
|
}
|
|
60
66
|
var _default = exports.default = {
|
|
61
67
|
page: async ({
|
|
@@ -63,45 +69,37 @@ var _default = exports.default = {
|
|
|
63
69
|
$tags,
|
|
64
70
|
page
|
|
65
71
|
}, use) => {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
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
|
-
}
|
|
80
|
-
const testPortalDetails = getCustomAccountDetails($tags);
|
|
81
|
-
if (testPortalDetails === null) {
|
|
82
|
-
await performDefaultPageSteps({
|
|
83
|
-
context,
|
|
84
|
-
$tags,
|
|
85
|
-
page
|
|
86
|
-
});
|
|
87
|
-
const user = (0, _auth.getDefaultActor)();
|
|
88
|
-
process.env.actorInfo = JSON.stringify(user);
|
|
89
|
-
await use(page);
|
|
90
|
-
} else {
|
|
91
|
-
await context.clearCookies();
|
|
72
|
+
try {
|
|
73
|
+
//This block is used to skip the login process if the @unauthenticated tag is added to the script
|
|
74
|
+
if ($tags.includes('@unauthenticated')) {
|
|
75
|
+
await context.clearCookies();
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
92
78
|
const {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
79
|
+
isAuthMode
|
|
80
|
+
} = (0, _readConfigFile.generateConfigFromFile)();
|
|
81
|
+
if (!isAuthMode) {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
const testPortalDetails = getCustomAccountDetails($tags);
|
|
85
|
+
if (testPortalDetails) {
|
|
86
|
+
await context.clearCookies();
|
|
87
|
+
const {
|
|
88
|
+
email
|
|
89
|
+
} = testPortalDetails;
|
|
90
|
+
await (0, _auth.performLoginSteps)({
|
|
91
|
+
page,
|
|
92
|
+
$tags,
|
|
93
|
+
context,
|
|
94
|
+
...testPortalDetails
|
|
95
|
+
}, async testInfo => {
|
|
96
|
+
return await verifyPageIsLoaded(testInfo);
|
|
97
|
+
}, loginSteps);
|
|
98
|
+
process.env.actorInfo = JSON.stringify(testPortalDetails);
|
|
99
|
+
}
|
|
100
|
+
} catch (error) {
|
|
101
|
+
console.error('Error during page', error);
|
|
102
|
+
} finally {
|
|
105
103
|
await performDefaultPageSteps({
|
|
106
104
|
context,
|
|
107
105
|
$tags,
|
|
@@ -9,6 +9,7 @@ var _path = _interopRequireDefault(require("path"));
|
|
|
9
9
|
var _fileUtils = require("../../utils/fileUtils");
|
|
10
10
|
var _logger = require("../../utils/logger");
|
|
11
11
|
var _readConfigFile = require("./readConfigFile");
|
|
12
|
+
var _checkAuthDirectory = require("./helpers/checkAuthDirectory");
|
|
12
13
|
function deleteAuthFiles(authFilePath) {
|
|
13
14
|
authFilePath = _path.default.resolve(process.cwd(), authFilePath);
|
|
14
15
|
const authFileFolder = _path.default.dirname(authFilePath);
|
|
@@ -24,6 +25,11 @@ function deleteGeneratedFeatures() {
|
|
|
24
25
|
_logger.Logger.log(_logger.Logger.INFO_TYPE, `Deleting generated features at ${featuresGenPath}`);
|
|
25
26
|
(0, _fileUtils.deleteFolder)(featuresGenPath);
|
|
26
27
|
}
|
|
28
|
+
function deleteLockFiles() {
|
|
29
|
+
const lockFilePath = (0, _checkAuthDirectory.getLockDirectoryPath)();
|
|
30
|
+
_logger.Logger.log(_logger.Logger.INFO_TYPE, `Deleting lock files at ${lockFilePath}`);
|
|
31
|
+
(0, _fileUtils.deleteFolder)(lockFilePath);
|
|
32
|
+
}
|
|
27
33
|
function clearCaches() {
|
|
28
34
|
try {
|
|
29
35
|
const {
|
|
@@ -33,6 +39,7 @@ function clearCaches() {
|
|
|
33
39
|
deleteAuthFiles(authFilePath);
|
|
34
40
|
deletePlaywrightReport(reportPath);
|
|
35
41
|
deleteGeneratedFeatures();
|
|
42
|
+
deleteLockFiles();
|
|
36
43
|
_logger.Logger.log(_logger.Logger.SUCCESS_TYPE, 'Caches Cleared. Now you can try running npm run uat');
|
|
37
44
|
} catch (err) {
|
|
38
45
|
_logger.Logger.error(err);
|
|
@@ -5,10 +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
|
-
stale:
|
|
8
|
+
stale: 100000,
|
|
9
9
|
retries: {
|
|
10
|
-
retries:
|
|
10
|
+
retries: 10,
|
|
11
11
|
factor: 1,
|
|
12
|
-
minTimeout:
|
|
12
|
+
minTimeout: 10000,
|
|
13
|
+
maxTimeout: 20000
|
|
13
14
|
}
|
|
14
15
|
};
|
|
@@ -4,4 +4,4 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.CUSTOM_COMMANDS = void 0;
|
|
7
|
-
const CUSTOM_COMMANDS = exports.CUSTOM_COMMANDS = ['mode', 'tags', 'edition', 'browsers', 'filePath'];
|
|
7
|
+
const CUSTOM_COMMANDS = exports.CUSTOM_COMMANDS = ['mode', 'tags', 'edition', 'browsers', 'filePath', 'headless'];
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
var _test = require("@playwright/test");
|
|
5
|
+
var _playwrightBdd = require("playwright-bdd");
|
|
6
|
+
var _readConfigFile = require("./readConfigFile");
|
|
7
|
+
var _builtInFixtures = _interopRequireDefault(require("./builtInFixtures"));
|
|
8
|
+
var _getUserFixtures = _interopRequireDefault(require("./helpers/getUserFixtures"));
|
|
9
|
+
const {
|
|
10
|
+
bddMode
|
|
11
|
+
} = (0, _readConfigFile.generateConfigFromFile)();
|
|
12
|
+
let base = bddMode ? _playwrightBdd.test : _test.test;
|
|
13
|
+
const buildInFixtures = (0, _builtInFixtures.default)(bddMode);
|
|
14
|
+
const buildInFixturesTest = base.extend({
|
|
15
|
+
...buildInFixtures
|
|
16
|
+
});
|
|
17
|
+
const userFixtures = (0, _getUserFixtures.default)();
|
|
18
|
+
const userFixturesTest = base.extend({
|
|
19
|
+
...userFixtures
|
|
20
|
+
});
|
|
21
|
+
const test = (0, _test.mergeTests)(buildInFixturesTest, userFixturesTest);
|
|
22
|
+
module.exports = {
|
|
23
|
+
test
|
|
24
|
+
};
|
|
@@ -6,48 +6,43 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.default = void 0;
|
|
8
8
|
var _path = _interopRequireDefault(require("path"));
|
|
9
|
-
var _fs = require("fs");
|
|
10
9
|
var _fileMutex = _interopRequireDefault(require("../fileMutex"));
|
|
11
10
|
var _fileMutexConfig = require("../../constants/fileMutexConfig");
|
|
12
|
-
var _accountLogin = _interopRequireDefault(require("./accountLogin"));
|
|
13
11
|
var _checkAuthCookies = require("./checkAuthCookies");
|
|
14
12
|
var _checkAuthDirectory = require("../checkAuthDirectory");
|
|
15
13
|
/* eslint-disable no-console */
|
|
16
14
|
|
|
17
|
-
async function performLoginSteps({
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
}
|
|
15
|
+
async function performLoginSteps(testInfo, isLoggedIn, loginSteps) {
|
|
16
|
+
let {
|
|
17
|
+
page,
|
|
18
|
+
authFilePrefix,
|
|
19
|
+
email
|
|
20
|
+
} = testInfo;
|
|
21
|
+
authFilePrefix = authFilePrefix || email;
|
|
23
22
|
const authFile = _path.default.resolve(_path.default.join((0, _checkAuthCookies.getAuthFileDirectory)(), `${authFilePrefix}-cookies.json`));
|
|
24
|
-
const lockFileName =
|
|
23
|
+
const lockFileName = email.replace(/[@.]/g, '_');
|
|
25
24
|
const fileMutex = new _fileMutex.default((0, _checkAuthDirectory.getLockDirectoryPath)(), lockFileName, _fileMutexConfig.LOGIN_MUTEX_TIMEOUT);
|
|
26
25
|
try {
|
|
27
26
|
await fileMutex.acquire();
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
27
|
+
await (0, _checkAuthCookies.loadCookiesIfPresent)(page, authFile);
|
|
28
|
+
await page.goto(process.env.domain);
|
|
29
|
+
await Promise.race([page.waitForNavigation(), page.waitForLoadState('networkidle'), page.waitForTimeout(5000)]);
|
|
30
|
+
const isAlreadyLoggedIn = await isLoggedIn(testInfo);
|
|
31
|
+
if (!isAlreadyLoggedIn) {
|
|
32
|
+
await loginSteps(testInfo);
|
|
32
33
|
await page.goto(process.env.domain);
|
|
33
|
-
await
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
await page.goto(process.env.domain);
|
|
38
|
-
await isLoggedIn(page);
|
|
39
|
-
await page.context().storageState({
|
|
40
|
-
path: authFile
|
|
41
|
-
});
|
|
42
|
-
}
|
|
34
|
+
await isLoggedIn(testInfo);
|
|
35
|
+
await page.context().storageState({
|
|
36
|
+
path: authFile
|
|
37
|
+
});
|
|
43
38
|
}
|
|
44
39
|
} catch (error) {
|
|
45
|
-
console.error(`Error during login for ${
|
|
40
|
+
console.error(`Error during login for ${email}:`, error);
|
|
46
41
|
} finally {
|
|
47
42
|
try {
|
|
48
43
|
await fileMutex.release();
|
|
49
44
|
} catch (releaseError) {
|
|
50
|
-
console.error(`Error releasing lock for ${
|
|
45
|
+
console.error(`Error releasing lock for ${email}:`, releaseError);
|
|
51
46
|
}
|
|
52
47
|
}
|
|
53
48
|
}
|
|
@@ -16,7 +16,7 @@ function getUATFileName(mode) {
|
|
|
16
16
|
if (_fs.default.existsSync(uatConfFilePath)) {
|
|
17
17
|
return uatConfFilePath;
|
|
18
18
|
}
|
|
19
|
-
return _path.default.resolve(process.cwd(), `uat.config.js`);
|
|
19
|
+
return _path.default.resolve(process.cwd(), `uat/conf/default/uat.config.js`);
|
|
20
20
|
}
|
|
21
21
|
function getEnvConfigFilePath(mode) {
|
|
22
22
|
const confFilePath = _path.default.resolve(process.cwd(), `uat/conf/${mode}/settings.json`);
|
|
@@ -8,44 +8,42 @@ exports.default = void 0;
|
|
|
8
8
|
var _path = _interopRequireDefault(require("path"));
|
|
9
9
|
var _properLockfile = _interopRequireDefault(require("proper-lockfile"));
|
|
10
10
|
var _fs = require("fs");
|
|
11
|
-
function _classPrivateMethodInitSpec(
|
|
12
|
-
function _checkPrivateRedeclaration(
|
|
13
|
-
function
|
|
14
|
-
var
|
|
15
|
-
var _createDirectoryIfNotExist = /*#__PURE__*/new WeakSet();
|
|
11
|
+
function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
|
|
12
|
+
function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
|
|
13
|
+
function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
|
|
14
|
+
var _FileMutex_brand = /*#__PURE__*/new WeakSet();
|
|
16
15
|
class FileMutex {
|
|
17
16
|
constructor(directory, lockFileName, options = {}) {
|
|
18
|
-
_classPrivateMethodInitSpec(this,
|
|
19
|
-
_classPrivateMethodInitSpec(this, _getLockFilePath);
|
|
17
|
+
_classPrivateMethodInitSpec(this, _FileMutex_brand);
|
|
20
18
|
this.directory = directory;
|
|
21
19
|
this.lockFileName = lockFileName + ".lock";
|
|
22
20
|
this.options = options;
|
|
23
21
|
}
|
|
24
22
|
async acquire() {
|
|
25
|
-
|
|
26
|
-
const lockFilePath =
|
|
23
|
+
_assertClassBrand(_FileMutex_brand, this, _createDirectoryIfNotExist).call(this);
|
|
24
|
+
const lockFilePath = _assertClassBrand(_FileMutex_brand, this, _getLockFilePath).call(this);
|
|
27
25
|
try {
|
|
28
26
|
if (!(0, _fs.existsSync)(lockFilePath)) {
|
|
29
27
|
console.log(`[DEBUG] Creating missing lock file:`, this.lockFileName);
|
|
30
28
|
(0, _fs.writeFileSync)(lockFilePath, 'locked');
|
|
31
29
|
}
|
|
32
|
-
await _properLockfile.default.lock(
|
|
30
|
+
await _properLockfile.default.lock(lockFilePath, this.options);
|
|
33
31
|
} catch (err) {
|
|
34
32
|
throw new Error(`Failed to acquire lock after ${this.options.retries.retries} attempts: ${err.message}`);
|
|
35
33
|
}
|
|
36
34
|
}
|
|
37
35
|
async release() {
|
|
38
36
|
try {
|
|
39
|
-
await _properLockfile.default.unlock(
|
|
37
|
+
await _properLockfile.default.unlock(_assertClassBrand(_FileMutex_brand, this, _getLockFilePath).call(this));
|
|
40
38
|
} catch (err) {
|
|
41
39
|
throw new Error(`Failed to release lock: ${err.message}`);
|
|
42
40
|
}
|
|
43
41
|
}
|
|
44
42
|
}
|
|
45
|
-
function
|
|
43
|
+
function _getLockFilePath() {
|
|
46
44
|
return _path.default.resolve(_path.default.join(this.directory, this.lockFileName));
|
|
47
45
|
}
|
|
48
|
-
function
|
|
46
|
+
function _createDirectoryIfNotExist() {
|
|
49
47
|
if (!(0, _fs.existsSync)(this.directory)) {
|
|
50
48
|
(0, _fs.mkdirSync)(this.directory, {
|
|
51
49
|
recursive: true
|
|
@@ -1,37 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
3
|
Object.defineProperty(exports, "__esModule", {
|
|
5
4
|
value: true
|
|
6
5
|
});
|
|
7
|
-
|
|
6
|
+
exports.createBdd = void 0;
|
|
7
|
+
Object.defineProperty(exports, "expect", {
|
|
8
8
|
enumerable: true,
|
|
9
9
|
get: function () {
|
|
10
|
-
return
|
|
10
|
+
return _test.expect;
|
|
11
11
|
}
|
|
12
12
|
});
|
|
13
|
-
Object.defineProperty(exports, "
|
|
13
|
+
Object.defineProperty(exports, "test", {
|
|
14
14
|
enumerable: true,
|
|
15
15
|
get: function () {
|
|
16
|
-
return
|
|
16
|
+
return _playwrightBdd.test;
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
|
-
|
|
20
|
-
var _bddFramework = require("../../bdd-framework");
|
|
19
|
+
var _playwrightBdd = require("playwright-bdd");
|
|
21
20
|
var _test = require("@playwright/test");
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
bddMode
|
|
27
|
-
} = (0, _readConfigFile.generateConfigFromFile)();
|
|
28
|
-
let base = bddMode ? _bddFramework.test : _test.test;
|
|
29
|
-
const buildInFixtures = (0, _builtInFixtures.default)(bddMode);
|
|
30
|
-
const buildInFixturesTest = base.extend({
|
|
31
|
-
...buildInFixtures
|
|
32
|
-
});
|
|
33
|
-
const userFixtures = (0, _getUserFixtures.default)();
|
|
34
|
-
const userFixturesTest = base.extend({
|
|
35
|
-
...userFixtures
|
|
36
|
-
});
|
|
37
|
-
const test = exports.test = (0, _test.mergeTests)(buildInFixturesTest, userFixturesTest);
|
|
21
|
+
let createBdd = function () {
|
|
22
|
+
return (0, _playwrightBdd.createBdd)(_playwrightBdd.test);
|
|
23
|
+
};
|
|
24
|
+
exports.createBdd = createBdd;
|
|
@@ -33,9 +33,9 @@ class SpawnRunner extends _Runner.default {
|
|
|
33
33
|
const {
|
|
34
34
|
tagArgs
|
|
35
35
|
} = this.runnerObj;
|
|
36
|
-
const configPath = (0, _readConfigFile.isUserConfigFileAvailable)() ? _path.default.resolve(__dirname, '../', 'setup', 'config-creator.js') : _path.default.resolve('../', '../', '../', '../', 'playwrightConfig.js');
|
|
36
|
+
const configPath = (0, _readConfigFile.isUserConfigFileAvailable)() ? _path.default.resolve(__dirname, '../', 'setup', 'config-creator.js') : _path.default.resolve(__dirname, '../', '../', '../', '../', 'playwrightConfig.js');
|
|
37
37
|
const beforeCommand = 'node';
|
|
38
|
-
const bddGenPath = _path.default.resolve(
|
|
38
|
+
const bddGenPath = _path.default.resolve((0, _rootPath.getExecutableBinaryPath)('bddgen'));
|
|
39
39
|
const beforeArgs = [bddGenPath, '-c', require.resolve(configPath)];
|
|
40
40
|
if (tagArgs) {
|
|
41
41
|
beforeArgs.push('--tags');
|
|
@@ -25,7 +25,8 @@ const {
|
|
|
25
25
|
featureFilesFolder,
|
|
26
26
|
stepDefinitionsFolder,
|
|
27
27
|
testIdAttribute,
|
|
28
|
-
globalTimeout
|
|
28
|
+
globalTimeout,
|
|
29
|
+
customReporter
|
|
29
30
|
} = uatConfig;
|
|
30
31
|
const projects = (0, _configUtils.getProjects)({
|
|
31
32
|
browsers,
|
|
@@ -39,12 +40,21 @@ const testDir = (0, _configUtils.getTestDir)(bddMode, process.cwd(), {
|
|
|
39
40
|
featureFilesFolder,
|
|
40
41
|
stepDefinitionsFolder
|
|
41
42
|
});
|
|
42
|
-
const
|
|
43
|
+
const use = {
|
|
43
44
|
trace,
|
|
44
45
|
video,
|
|
45
46
|
viewport,
|
|
46
47
|
testIdAttribute
|
|
47
|
-
}
|
|
48
|
+
};
|
|
49
|
+
let reporter = [['html', {
|
|
50
|
+
outputFolder: reportPath,
|
|
51
|
+
open: openReportOn
|
|
52
|
+
}], ['list'], ['json', {
|
|
53
|
+
outputFile: _path.default.join(process.cwd(), 'uat', 'test-results', 'test-results.json')
|
|
54
|
+
}], ['./custom-reporter.js']];
|
|
55
|
+
if (customReporter) {
|
|
56
|
+
reporter = [customReporter, ...reporter];
|
|
57
|
+
}
|
|
48
58
|
|
|
49
59
|
/**
|
|
50
60
|
* Playwright configuration object
|
|
@@ -57,15 +67,12 @@ function getPlaywrightConfig() {
|
|
|
57
67
|
globalTimeout: globalTimeout || 3600000,
|
|
58
68
|
outputDir: _path.default.join(process.cwd(), 'uat', 'test-results'),
|
|
59
69
|
fullyParallel: true,
|
|
60
|
-
reporter
|
|
61
|
-
outputFolder: reportPath,
|
|
62
|
-
open: openReportOn
|
|
63
|
-
}], ['list'], ['./custom-reporter.js']],
|
|
70
|
+
reporter,
|
|
64
71
|
timeout: testTimeout,
|
|
65
72
|
expect: {
|
|
66
73
|
timeout: expectTimeout
|
|
67
74
|
},
|
|
68
|
-
use
|
|
75
|
+
use,
|
|
69
76
|
projects: isAuthMode ? [{
|
|
70
77
|
name: 'setup',
|
|
71
78
|
testMatch: /.*\.setup\.js/,
|
|
@@ -7,14 +7,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.getBrowsersList = getBrowsersList;
|
|
8
8
|
exports.getProjects = getProjects;
|
|
9
9
|
exports.getTestDir = getTestDir;
|
|
10
|
-
exports.getTestUseOptions = getTestUseOptions;
|
|
11
10
|
var _test = require("@playwright/test");
|
|
12
11
|
var _path = _interopRequireDefault(require("path"));
|
|
13
12
|
var _readConfigFile = require("../readConfigFile");
|
|
14
|
-
var
|
|
13
|
+
var _playwrightBdd = require("playwright-bdd");
|
|
15
14
|
var _logger = require("../../../utils/logger");
|
|
16
15
|
var _browserTypes = require("../constants/browserTypes");
|
|
17
|
-
var _configFileNameProvider = require("../helpers/configFileNameProvider");
|
|
18
16
|
var _fileUtils = require("../../../utils/fileUtils");
|
|
19
17
|
/**
|
|
20
18
|
** Playwright project configuration
|
|
@@ -148,30 +146,15 @@ function getPathsForFeatureFiles(cwd) {
|
|
|
148
146
|
function getTestDir(bddMode, cwd, {
|
|
149
147
|
stepDefinitionsFolder
|
|
150
148
|
}) {
|
|
151
|
-
return bddMode ? (0,
|
|
152
|
-
|
|
153
|
-
|
|
149
|
+
return bddMode ? (0, _playwrightBdd.defineBddConfig)({
|
|
150
|
+
features: getPathsForFeatureFiles(cwd),
|
|
151
|
+
steps: [_path.default.join(cwd, 'uat', '**', stepDefinitionsFolder, '*.spec.js'), require.resolve('../fixtures.js')],
|
|
152
|
+
importTestFrom: require.resolve('../fixtures.js'),
|
|
154
153
|
featuresRoot: _path.default.join(cwd, 'uat'),
|
|
155
154
|
outputDir: _path.default.join(cwd, 'uat', '.features-gen'),
|
|
155
|
+
disableWarnings: {
|
|
156
|
+
importTestFrom: true
|
|
157
|
+
},
|
|
156
158
|
publish: true
|
|
157
159
|
}) : _path.default.join(cwd, 'uat');
|
|
158
|
-
}
|
|
159
|
-
function getTestUseOptions({
|
|
160
|
-
viewport,
|
|
161
|
-
trace,
|
|
162
|
-
video,
|
|
163
|
-
testIdAttribute
|
|
164
|
-
}) {
|
|
165
|
-
let defaultTestuseOptions = {
|
|
166
|
-
viewport,
|
|
167
|
-
testIdAttribute,
|
|
168
|
-
trace: trace ? 'on' : 'off',
|
|
169
|
-
video: video ? {
|
|
170
|
-
mode: 'on',
|
|
171
|
-
size: {
|
|
172
|
-
...viewport
|
|
173
|
-
}
|
|
174
|
-
} : 'off'
|
|
175
|
-
};
|
|
176
|
-
return defaultTestuseOptions;
|
|
177
160
|
}
|