@zohodesk/testinglibrary 0.4.28-experimental → 0.4.29-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.
Files changed (126) hide show
  1. package/.gitlab-ci.yml +1 -1
  2. package/README.md +32 -1
  3. package/build/core/playwright/builtInFixtures/page.js +44 -45
  4. package/build/core/playwright/custom-commands.js +1 -1
  5. package/build/core/playwright/fixtures.js +24 -0
  6. package/build/core/playwright/helpers/auth/loginSteps.js +15 -8
  7. package/build/core/playwright/index.js +10 -23
  8. package/build/core/playwright/runner/SpawnRunner.js +2 -2
  9. package/build/core/playwright/setup/config-creator.js +13 -8
  10. package/build/core/playwright/setup/config-utils.js +8 -25
  11. package/build/core/playwright/test-runner.js +1 -1
  12. package/build/decorators.d.ts +1 -1
  13. package/build/decorators.js +1 -1
  14. package/build/setup-folder-structure/samples/actors-index.js +2 -0
  15. package/build/setup-folder-structure/samples/auth-setup-sample.js +14 -66
  16. package/build/setup-folder-structure/samples/editions-index.js +3 -0
  17. package/build/setup-folder-structure/samples/free-sample.json +25 -0
  18. package/build/setup-folder-structure/samples/settings.json +7 -0
  19. package/build/setup-folder-structure/setupProject.js +18 -5
  20. package/npm-shrinkwrap.json +6188 -2192
  21. package/package.json +11 -10
  22. package/playwright.config.js +0 -48
  23. package/build/bdd-framework/cli/commands/env.js +0 -42
  24. package/build/bdd-framework/cli/commands/export.js +0 -62
  25. package/build/bdd-framework/cli/commands/test.js +0 -64
  26. package/build/bdd-framework/cli/index.js +0 -11
  27. package/build/bdd-framework/cli/options.js +0 -19
  28. package/build/bdd-framework/cli/worker.js +0 -13
  29. package/build/bdd-framework/config/configDir.js +0 -35
  30. package/build/bdd-framework/config/enrichReporterData.js +0 -23
  31. package/build/bdd-framework/config/env.js +0 -50
  32. package/build/bdd-framework/config/index.js +0 -94
  33. package/build/bdd-framework/config/lang.js +0 -14
  34. package/build/bdd-framework/cucumber/buildStepDefinition.js +0 -43
  35. package/build/bdd-framework/cucumber/createTestStep.js +0 -43
  36. package/build/bdd-framework/cucumber/formatter/EventDataCollector.js +0 -126
  37. package/build/bdd-framework/cucumber/formatter/GherkinDocumentParser.js +0 -72
  38. package/build/bdd-framework/cucumber/formatter/PickleParser.js +0 -25
  39. package/build/bdd-framework/cucumber/formatter/durationHelpers.js +0 -13
  40. package/build/bdd-framework/cucumber/formatter/getColorFns.js +0 -57
  41. package/build/bdd-framework/cucumber/formatter/index.js +0 -16
  42. package/build/bdd-framework/cucumber/formatter/locationHelpers.js +0 -16
  43. package/build/bdd-framework/cucumber/loadConfig.js +0 -17
  44. package/build/bdd-framework/cucumber/loadFeatures.js +0 -70
  45. package/build/bdd-framework/cucumber/loadSnippetBuilder.js +0 -20
  46. package/build/bdd-framework/cucumber/loadSteps.js +0 -47
  47. package/build/bdd-framework/cucumber/resolveFeaturePaths.js +0 -62
  48. package/build/bdd-framework/cucumber/stepArguments.js +0 -21
  49. package/build/bdd-framework/cucumber/types.js +0 -5
  50. package/build/bdd-framework/cucumber/valueChecker.js +0 -23
  51. package/build/bdd-framework/decorators.js +0 -18
  52. package/build/bdd-framework/gen/fixtures.js +0 -48
  53. package/build/bdd-framework/gen/formatter.js +0 -167
  54. package/build/bdd-framework/gen/i18n.js +0 -39
  55. package/build/bdd-framework/gen/index.js +0 -197
  56. package/build/bdd-framework/gen/specialTags.js +0 -70
  57. package/build/bdd-framework/gen/testFile.js +0 -470
  58. package/build/bdd-framework/gen/testMeta.js +0 -60
  59. package/build/bdd-framework/gen/testNode.js +0 -35
  60. package/build/bdd-framework/gen/testPoms.js +0 -133
  61. package/build/bdd-framework/hooks/scenario.js +0 -130
  62. package/build/bdd-framework/hooks/worker.js +0 -89
  63. package/build/bdd-framework/index.js +0 -52
  64. package/build/bdd-framework/playwright/fixtureParameterNames.js +0 -93
  65. package/build/bdd-framework/playwright/getLocationInFile.js +0 -79
  66. package/build/bdd-framework/playwright/loadConfig.js +0 -42
  67. package/build/bdd-framework/playwright/loadUtils.js +0 -33
  68. package/build/bdd-framework/playwright/testTypeImpl.js +0 -79
  69. package/build/bdd-framework/playwright/transform.js +0 -88
  70. package/build/bdd-framework/playwright/types.js +0 -12
  71. package/build/bdd-framework/playwright/utils.js +0 -56
  72. package/build/bdd-framework/reporter/cucumber/base.js +0 -52
  73. package/build/bdd-framework/reporter/cucumber/custom.js +0 -73
  74. package/build/bdd-framework/reporter/cucumber/helper.js +0 -12
  75. package/build/bdd-framework/reporter/cucumber/html.js +0 -40
  76. package/build/bdd-framework/reporter/cucumber/index.js +0 -74
  77. package/build/bdd-framework/reporter/cucumber/json.js +0 -312
  78. package/build/bdd-framework/reporter/cucumber/junit.js +0 -205
  79. package/build/bdd-framework/reporter/cucumber/message.js +0 -20
  80. package/build/bdd-framework/reporter/cucumber/messagesBuilder/AttachmentMapper.js +0 -82
  81. package/build/bdd-framework/reporter/cucumber/messagesBuilder/Builder.js +0 -197
  82. package/build/bdd-framework/reporter/cucumber/messagesBuilder/GherkinDocument.js +0 -43
  83. package/build/bdd-framework/reporter/cucumber/messagesBuilder/GherkinDocumentClone.js +0 -52
  84. package/build/bdd-framework/reporter/cucumber/messagesBuilder/GherkinDocuments.js +0 -105
  85. package/build/bdd-framework/reporter/cucumber/messagesBuilder/Hook.js +0 -70
  86. package/build/bdd-framework/reporter/cucumber/messagesBuilder/Meta.js +0 -45
  87. package/build/bdd-framework/reporter/cucumber/messagesBuilder/Pickles.js +0 -27
  88. package/build/bdd-framework/reporter/cucumber/messagesBuilder/Projects.js +0 -38
  89. package/build/bdd-framework/reporter/cucumber/messagesBuilder/TestCase.js +0 -128
  90. package/build/bdd-framework/reporter/cucumber/messagesBuilder/TestCaseRun.js +0 -154
  91. package/build/bdd-framework/reporter/cucumber/messagesBuilder/TestCaseRunHooks.js +0 -123
  92. package/build/bdd-framework/reporter/cucumber/messagesBuilder/TestStepAttachments.js +0 -67
  93. package/build/bdd-framework/reporter/cucumber/messagesBuilder/TestStepRun.js +0 -114
  94. package/build/bdd-framework/reporter/cucumber/messagesBuilder/index.js +0 -30
  95. package/build/bdd-framework/reporter/cucumber/messagesBuilder/pwStepUtils.js +0 -70
  96. package/build/bdd-framework/reporter/cucumber/messagesBuilder/timing.js +0 -35
  97. package/build/bdd-framework/reporter/cucumber/messagesBuilder/types.js +0 -5
  98. package/build/bdd-framework/run/StepInvoker.js +0 -69
  99. package/build/bdd-framework/run/bddData/index.js +0 -59
  100. package/build/bdd-framework/run/bddData/types.js +0 -5
  101. package/build/bdd-framework/run/bddFixtures.js +0 -192
  102. package/build/bdd-framework/run/bddWorld.js +0 -79
  103. package/build/bdd-framework/run/bddWorldInternal.js +0 -11
  104. package/build/bdd-framework/snippets/index.js +0 -132
  105. package/build/bdd-framework/snippets/snippetSyntax.js +0 -43
  106. package/build/bdd-framework/snippets/snippetSyntaxDecorators.js +0 -26
  107. package/build/bdd-framework/snippets/snippetSyntaxTs.js +0 -18
  108. package/build/bdd-framework/stepDefinitions/createBdd.js +0 -66
  109. package/build/bdd-framework/stepDefinitions/decorators/class.js +0 -68
  110. package/build/bdd-framework/stepDefinitions/decorators/steps.js +0 -99
  111. package/build/bdd-framework/stepDefinitions/defineStep.js +0 -62
  112. package/build/bdd-framework/stepDefinitions/stepConfig.js +0 -24
  113. package/build/bdd-framework/steps/createBdd.js +0 -78
  114. package/build/bdd-framework/steps/decorators/class.js +0 -68
  115. package/build/bdd-framework/steps/decorators/steps.js +0 -98
  116. package/build/bdd-framework/steps/defineStep.js +0 -62
  117. package/build/bdd-framework/steps/stepConfig.js +0 -24
  118. package/build/bdd-framework/utils/AutofillMap.js +0 -20
  119. package/build/bdd-framework/utils/exit.js +0 -62
  120. package/build/bdd-framework/utils/index.js +0 -93
  121. package/build/bdd-framework/utils/jsStringWrap.js +0 -44
  122. package/build/bdd-framework/utils/logger.js +0 -30
  123. package/build/bdd-framework/utils/stripAnsiEscapes.js +0 -20
  124. package/build/setup-folder-structure/samples/authUsers-sample.json +0 -9
  125. package/build/setup-folder-structure/samples/env-config-sample.json +0 -21
  126. package/unit_reports/unit-report.html +0 -260
package/.gitlab-ci.yml CHANGED
@@ -1,4 +1,4 @@
1
- image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v2
1
+ image: repository.desk.csez.zohocorpin.com/base-image/testing-framework-gitlab-runne-base:v3
2
2
 
3
3
  workflow:
4
4
  rules:
package/README.md CHANGED
@@ -26,13 +26,44 @@
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
- ### v0.2.9 - 24-10-2024
29
+
30
+ ## Version History
31
+
32
+ ### v0.2.9 - 25-10-2024
30
33
 
31
34
  #### Feature
32
35
  - Added support for scenario level tag support
33
36
  - Added a new cli optin like uat-validate to validate the feature files using playwright-bdd
34
37
  - Mode based configuration implementations
35
38
  - @only option enabled in dev pipeline
39
+ - Latest setup related configuration changed for init option
40
+
41
+ ### v0.3.0 - 25-10-2024
42
+
43
+ #### Features
44
+ - Added support for scenario level tag support
45
+ - Updated the configuration for `video` and `trace` to accept Playwright-specific values instead of boolean values.
46
+ - Below package versions are updated in this release.
47
+ - playwright - 1.48.0,
48
+ - playwright-bdd - 7.5.0,
49
+ - @playwright/test - 1.48.0,
50
+ - @cucumber/cucumber - 11.0.1
51
+ - From this version, We adopt the playwright-bdd as library instead of modified source
52
+ - Published on 11-11-2024
53
+
54
+ #### Deprecations
55
+ - **Deprecated**: Passing `video` and `trace` as boolean (`true`/`false`) in project configuration.
56
+ - **New Approach**: Use Playwright values for `video` and `trace` options, such as `'on'`, `'retain-on-failure'`, or `'off'`.
57
+
58
+ ### v0.3.1 - 13-11-2024
59
+
60
+ #### Issue Fix
61
+ - Adding bddmode to get the fixtures.
62
+
63
+ ### v0.3.3 - 27-11-2024
64
+
65
+ #### Feature
66
+ - Custom report integration support (ReportPortal)
36
67
 
37
68
  ### v0.2.9.1 - 14-11-2024
38
69
 
@@ -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,
@@ -50,12 +58,10 @@ async function performDefaultPageSteps({
50
58
  }
51
59
  }
52
60
  async function verifyPageIsLoaded(page) {
53
- const urlOrigin = (0, _getUrlOrigin.default)(page.url());
54
- const domainOrigin = (0, _getUrlOrigin.default)(process.env.domain);
55
- if (urlOrigin === domainOrigin) {
56
- return true;
61
+ if (testSetup.validateLogin && typeof testSetup.validateLogin === 'function') {
62
+ return await testSetup.validateLogin(page);
57
63
  }
58
- return false;
64
+ return true;
59
65
  }
60
66
  var _default = exports.default = {
61
67
  page: async ({
@@ -63,45 +69,38 @@ var _default = exports.default = {
63
69
  $tags,
64
70
  page
65
71
  }, use) => {
66
- const {
67
- isAuthMode
68
- } = (0, _readConfigFile.generateConfigFromFile)();
69
- if (!isAuthMode) {
70
- await use(page);
71
- return;
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
- email,
94
- password
95
- } = testPortalDetails;
96
- await (0, _auth.performLoginSteps)({
97
- page,
98
- authFilePrefix: email,
99
- useremail: email,
100
- password: password
101
- }, async () => {
102
- return await verifyPageIsLoaded(page);
103
- });
104
- process.env.actorInfo = JSON.stringify(testPortalDetails);
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
+ authFilePrefix: email,
95
+ ...testPortalDetails
96
+ }, async () => {
97
+ return await verifyPageIsLoaded(page);
98
+ }, loginSteps);
99
+ process.env.actorInfo = JSON.stringify(testPortalDetails);
100
+ }
101
+ } catch (error) {
102
+ console.error('Error during page', error);
103
+ } finally {
105
104
  await performDefaultPageSteps({
106
105
  context,
107
106
  $tags,
@@ -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', 'headless'];
7
+ const CUSTOM_COMMANDS = exports.CUSTOM_COMMANDS = ['mode', 'tags', 'edition', 'browsers', 'filePath'];
@@ -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
+ };
@@ -8,7 +8,6 @@ exports.default = void 0;
8
8
  var _path = _interopRequireDefault(require("path"));
9
9
  var _fileMutex = _interopRequireDefault(require("../fileMutex"));
10
10
  var _fileMutexConfig = require("../../constants/fileMutexConfig");
11
- var _accountLogin = _interopRequireDefault(require("./accountLogin"));
12
11
  var _checkAuthCookies = require("./checkAuthCookies");
13
12
  var _checkAuthDirectory = require("../checkAuthDirectory");
14
13
  /* eslint-disable no-console */
@@ -16,11 +15,13 @@ var _checkAuthDirectory = require("../checkAuthDirectory");
16
15
  async function performLoginSteps({
17
16
  page,
18
17
  authFilePrefix,
19
- useremail,
20
- password
21
- }, isLoggedIn) {
18
+ email,
19
+ password,
20
+ context,
21
+ $tags
22
+ }, isLoggedIn, loginSteps) {
22
23
  const authFile = _path.default.resolve(_path.default.join((0, _checkAuthCookies.getAuthFileDirectory)(), `${authFilePrefix}-cookies.json`));
23
- const lockFileName = useremail.replace(/[@.]/g, '_');
24
+ const lockFileName = email.replace(/[@.]/g, '_');
24
25
  const fileMutex = new _fileMutex.default((0, _checkAuthDirectory.getLockDirectoryPath)(), lockFileName, _fileMutexConfig.LOGIN_MUTEX_TIMEOUT);
25
26
  try {
26
27
  await fileMutex.acquire();
@@ -29,7 +30,13 @@ async function performLoginSteps({
29
30
  await Promise.race([page.waitForNavigation(), page.waitForLoadState('networkidle'), page.waitForTimeout(5000)]);
30
31
  const isAlreadyLoggedIn = await isLoggedIn(page);
31
32
  if (!isAlreadyLoggedIn) {
32
- await (0, _accountLogin.default)(page, useremail, password);
33
+ await loginSteps({
34
+ page,
35
+ email,
36
+ password,
37
+ context,
38
+ $tags
39
+ });
33
40
  await page.goto(process.env.domain);
34
41
  await isLoggedIn(page);
35
42
  await page.context().storageState({
@@ -37,12 +44,12 @@ async function performLoginSteps({
37
44
  });
38
45
  }
39
46
  } catch (error) {
40
- console.error(`Error during login for ${useremail}:`, error);
47
+ console.error(`Error during login for ${email}:`, error);
41
48
  } finally {
42
49
  try {
43
50
  await fileMutex.release();
44
51
  } catch (releaseError) {
45
- console.error(`Error releasing lock for ${useremail}:`, releaseError);
52
+ console.error(`Error releasing lock for ${email}:`, releaseError);
46
53
  }
47
54
  }
48
55
  }
@@ -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
- Object.defineProperty(exports, "createBdd", {
6
+ exports.createBdd = void 0;
7
+ Object.defineProperty(exports, "expect", {
8
8
  enumerable: true,
9
9
  get: function () {
10
- return _bddFramework.createBdd;
10
+ return _test.expect;
11
11
  }
12
12
  });
13
- Object.defineProperty(exports, "expect", {
13
+ Object.defineProperty(exports, "test", {
14
14
  enumerable: true,
15
15
  get: function () {
16
- return _test.expect;
16
+ return _playwrightBdd.test;
17
17
  }
18
18
  });
19
- exports.test = void 0;
20
- var _bddFramework = require("../../bdd-framework");
19
+ var _playwrightBdd = require("playwright-bdd");
21
20
  var _test = require("@playwright/test");
22
- var _readConfigFile = require("./readConfigFile");
23
- var _builtInFixtures = _interopRequireDefault(require("./builtInFixtures"));
24
- var _getUserFixtures = _interopRequireDefault(require("./helpers/getUserFixtures"));
25
- const {
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(__dirname, '../', '../', '../', 'bdd-framework', 'cli', 'index.js');
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,19 @@ const testDir = (0, _configUtils.getTestDir)(bddMode, process.cwd(), {
39
40
  featureFilesFolder,
40
41
  stepDefinitionsFolder
41
42
  });
42
- const testOptions = (0, _configUtils.getTestUseOptions)({
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'], ['./custom-reporter.js']];
53
+ if (customReporter) {
54
+ reporter = [customReporter, ...reporter];
55
+ }
48
56
 
49
57
  /**
50
58
  * Playwright configuration object
@@ -57,15 +65,12 @@ function getPlaywrightConfig() {
57
65
  globalTimeout: globalTimeout || 3600000,
58
66
  outputDir: _path.default.join(process.cwd(), 'uat', 'test-results'),
59
67
  fullyParallel: true,
60
- reporter: [['html', {
61
- outputFolder: reportPath,
62
- open: openReportOn
63
- }], ['list'], ['./custom-reporter.js']],
68
+ reporter,
64
69
  timeout: testTimeout,
65
70
  expect: {
66
71
  timeout: expectTimeout
67
72
  },
68
- use: testOptions,
73
+ use,
69
74
  projects: isAuthMode ? [{
70
75
  name: 'setup',
71
76
  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 _bddFramework = require("../../../bdd-framework");
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, _bddFramework.defineBddConfig)({
152
- paths: getPathsForFeatureFiles(cwd),
153
- import: [_path.default.join(cwd, 'uat', '**', stepDefinitionsFolder, '*.spec.js')],
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
  }
@@ -24,7 +24,7 @@ var _RunnerHelper = _interopRequireDefault(require("./runner/RunnerHelper"));
24
24
  var _Runner = _interopRequireDefault(require("./runner/Runner"));
25
25
  function runPreprocessing(tagArgs, configPath) {
26
26
  const beforeCommand = 'node';
27
- const bddGenPath = _path.default.resolve(__dirname, '../', '../', 'bdd-framework', 'cli', 'index.js');
27
+ const bddGenPath = _path.default.resolve((0, _rootPath.getExecutableBinaryPath)('bddgen'));
28
28
  const beforeArgs = [bddGenPath, '-c', configPath];
29
29
  if (tagArgs) {
30
30
  beforeArgs.push('--tags');
@@ -1 +1 @@
1
- export * from './bdd-framework/decorators';
1
+ export * from 'playwright-bdd/decorators';
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- var _decorators = require("./bdd-framework/decorators");
6
+ var _decorators = require("playwright-bdd/decorators");
7
7
  Object.keys(_decorators).forEach(function (key) {
8
8
  if (key === "default" || key === "__esModule") return;
9
9
  if (key in exports && exports[key] === _decorators[key]) return;
@@ -0,0 +1,2 @@
1
+ const editions = require('./editions/index');
2
+ module.exports = { editions }
@@ -1,73 +1,21 @@
1
1
  /* eslint-disable no-console */
2
2
  import { test as setup, expect } from '@zohodesk/testinglibrary';
3
- import path from 'path';
4
- import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
5
- import { getAuthFileDirectory } from '../../core/playwright';
6
- import { Logger } from '../../utils/logger';
3
+ import {
4
+ performLoginSteps,
5
+ getDefaultActor
6
+ } from '@zohodesk/testinglibrary/helpers';
7
7
 
8
- const userdata = require('./authUsers.json');
8
+ const user = getDefaultActor();
9
9
 
10
- const authContent = { cookies: [] };
11
-
12
- const LOGIN_ERR_MESSAGE = 'Need go be logged in';
13
- // const AUTH_ERR_MESSAGE = `Founded Path - ${path.resolve(process.cwd(),'uat','playwright','.auth')} \n Find if file is Properly Created. Cookies Cannot Be Read .. `
14
-
15
- function convertCookiesToParse(cookies, authFilePath) {
16
- try {
17
- return JSON.parse(cookies);
18
- } catch (err) {
19
- Logger.error(err);
20
- throw new Error(
21
- ` Error while parsing cookies ${err} \n${path.resolve(
22
- process.cwd(),
23
- authFilePath
24
- )} File is Empty`
25
- );
26
- // process.exit()
27
- }
28
- }
29
- const authDirectory = getAuthFileDirectory(); //path.resolve(process.cwd(), 'uat', 'playwright', '.auth');
30
- if (!existsSync(authDirectory)) {
31
- console.log('Creating auth directory for the first time setup...');
32
- mkdirSync(authDirectory, { recursive: true });
10
+ async function verifyPageIsLoaded(page) {
11
+ //Implement your validation steps here
12
+ //Refer desk_client_app auth.setup.js
13
+ return true;
33
14
  }
34
15
 
35
- userdata.forEach(data => {
36
- const authFile = path.resolve(path.join(authDirectory, `${data.filename}`));
37
- if (!existsSync(authFile)) {
38
- console.log('creating auth file..');
39
- writeFileSync(authFile, JSON.stringify(authContent, null, 2));
40
- }
41
- setup(data.description, async ({ page }) => {
42
- try {
43
- const cookies = readFileSync(authFile);
44
- const parsedCookies = convertCookiesToParse(cookies, authFile);
45
- await page
46
- .context()
47
- .addCookies(
48
- parsedCookies.cookies === undefined ? [] : parsedCookies.cookies
49
- );
50
- await page.goto(page.getBaseUrl());
51
- await page.waitForLoadState();
52
- if (await page.url().includes(process.env.domain)) {
53
- await page.waitForSelector(data.locator);
54
- } else {
55
- throw new Error(LOGIN_ERR_MESSAGE);
56
- }
57
- } catch (err) {
58
- if (err.message === LOGIN_ERR_MESSAGE) {
59
- await expect(page.locator('.load-bg')).toBeHidden();
60
- await page.locator('#login_id').type(data.useremail);
61
- await page.locator('#nextbtn').click();
62
- await page.locator('#password').type(data.password);
63
- await page.locator('#nextbtn').click();
64
-
65
- await page.waitForLoadState('networkidle');
66
-
67
- await page.waitForSelector(data.locator);
16
+ setup(`${user.edition} - Authentication`, async ({ page }) => {
68
17
 
69
- await page.context().storageState({ path: authFile });
70
- }
71
- }
72
- });
73
- });
18
+ //Implement performLoginSteps here
19
+ const { email, password } = user;
20
+ await performLoginSteps({ },verifyPageIsLoaded );
21
+ });
@@ -0,0 +1,3 @@
1
+ const free = require('./free.json');
2
+ const editions = { free};
3
+ module.exports = editions;
@@ -0,0 +1,25 @@
1
+ [
2
+ {
3
+ "id": "1",
4
+ "edition": "free",
5
+ "orgName": "orgFree",
6
+ "profiles": [
7
+ {
8
+ "profile": "admin",
9
+ "email": "admin+free@zohotest.com",
10
+ "password": "password@0987"
11
+ },
12
+ {
13
+ "profile": "agent",
14
+ "email": "agent@zohotest.com",
15
+ "password": "password@12345"
16
+ },
17
+ {
18
+ "profile": "lightagent",
19
+ "email": "lightagent@zohotest.com",
20
+ "password": "password@12345"
21
+ }
22
+ ]
23
+ }
24
+ ]
25
+
@@ -0,0 +1,7 @@
1
+ {
2
+ "environment": "dev",
3
+ "edition": "enterprise",
4
+ "profile": "admin",
5
+ "domain": "https://zdesk-devops16.csez.zohocorpin.com:31025/agent",
6
+ "devUrl" : ""
7
+ }
@@ -10,8 +10,9 @@ var _path = _interopRequireDefault(require("path"));
10
10
  var _logger = require("../utils/logger");
11
11
  function getScriptsToBeAdded() {
12
12
  return {
13
- "uat": "ZDTestingFramework test --mode=prod --headed",
14
- "uat-debug": "ZDTestingFramework test --mode=prod --debug",
13
+ "uat": "ZDTestingFramework test --mode=dev --headed",
14
+ "uat-debug": "ZDTestingFramework test --mode=dev --debug",
15
+ "uat-validate": "ZDTestingFramework validate",
15
16
  "uat-report": "ZDTestingFramework report --port=9009",
16
17
  "codegen": "ZDTestingFramework codegen deskclientapp.localzoho.com/agent"
17
18
  };
@@ -71,7 +72,6 @@ function createAuthenticationFile() {
71
72
  });
72
73
  }
73
74
  (0, _fs.writeFileSync)(_path.default.resolve(process.cwd(), 'uat', 'fixtures', 'auth.setup.js'), getSetupFileAsString('auth-setup-sample.js'), null, 2);
74
- (0, _fs.writeFileSync)(_path.default.resolve(process.cwd(), 'uat', 'fixtures', 'authUsers.json'), getSetupFileAsString('authUsers-sample.json'), null, 2);
75
75
  _logger.Logger.log(_logger.Logger.INFO_TYPE, 'Creating Authentication File ....');
76
76
  } catch (err) {
77
77
  _logger.Logger.error(err);
@@ -84,8 +84,21 @@ function createAuthenticationFile() {
84
84
  function createConfigJson() {
85
85
  const uatFolder = _path.default.resolve(process.cwd(), 'uat');
86
86
  if ((0, _fs.existsSync)(uatFolder)) {
87
- _logger.Logger.log(_logger.Logger.INFO_TYPE, 'Creating env-config file inside UAT Folder');
88
- (0, _fs.writeFileSync)(_path.default.resolve(uatFolder, './env-config.json'), getSetupFileAsString('env-config-sample.json'), null, 2);
87
+ _logger.Logger.log(_logger.Logger.INFO_TYPE, 'Creating settings.json file inside UAT Folder');
88
+ if (!(0, _fs.existsSync)(_path.default.resolve(uatFolder, 'conf', 'default'))) {
89
+ (0, _fs.mkdirSync)(_path.default.resolve(uatFolder, 'conf', 'default'), {
90
+ recursive: true
91
+ });
92
+ }
93
+ (0, _fs.writeFileSync)(_path.default.resolve(uatFolder, 'conf', 'default', './settings.json'), getSetupFileAsString('settings.json'), null, 2);
94
+ if (!(0, _fs.existsSync)(_path.default.resolve(uatFolder, 'conf', 'default', 'actors', 'editions'))) {
95
+ (0, _fs.mkdirSync)(_path.default.resolve(uatFolder, 'conf', 'default', 'actors', 'editions'), {
96
+ recursive: true
97
+ });
98
+ }
99
+ (0, _fs.writeFileSync)(_path.default.resolve(uatFolder, 'conf', 'default', 'actors', 'editions', 'free.json'), getSetupFileAsString('free-sample.json'), null, 2);
100
+ (0, _fs.writeFileSync)(_path.default.resolve(uatFolder, 'conf', 'default', 'actors', 'editions', 'index.js'), getSetupFileAsString('editions-index.js'), null, 2);
101
+ (0, _fs.writeFileSync)(_path.default.resolve(uatFolder, 'conf', 'default', 'actors', 'index.js'), getSetupFileAsString('actors-index.js'), null, 2);
89
102
  } else {
90
103
  _logger.Logger.log(_logger.Logger.INFO_TYPE, 'Something went wrong. Please re-initialize the @zohodesk/testinglibrary');
91
104
  }