@zohodesk/testinglibrary 0.1.12-experimental → 0.1.16-experimental

package/build/core/playwright/codegen.js

@@ -7,13 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = generateCodegen;
 var _path = _interopRequireDefault(require("path"));
 var _rootPath = require("../../utils/rootPath");
-var _spawnInheritChild = require("./spawnInheritChild");
+var _runCommand = require("./runCommand");
 function generateCodegen() {
   const domainUrl = process.argv.slice(3);
   const playwrightPath = _path.default.resolve((0, _rootPath.getExecutableBinaryPath)('playwright'));
   const command = playwrightPath;
   const args = ['codegen'].concat(domainUrl);
-  (0, _spawnInheritChild.spawnInheritChild)(command, args, {
+  (0, _runCommand.runCommand)(command, args, {
     exitOnSuccess: true,
     killOnParentExit: true
   });

package/build/core/playwright/helpers/auth/checkAuthCookies.js

@@ -15,7 +15,7 @@ var _fileUtils = require("../../../../utils/fileUtils");
 var _logger = require("../../../../utils/logger");
 /* eslint-disable no-console */
 
-const authCookieNameKeys = ['iamadt', 'iambdt'];
+const authCookieNameKeys = ['iamadt', 'iambdt', 'iamsdt'];
 function getAuthFileDirectory() {
   const {
     uatDirectory

package/build/core/playwright/reporter/PlaywrightReporter.js

@@ -9,7 +9,7 @@ var _path = _interopRequireDefault(require("path"));
 var _rootPath = require("../../../utils/rootPath");
 var _readConfigFile = require("../readConfigFile");
 var _configConstants = _interopRequireDefault(require("../constants/configConstants"));
-var _spawnInheritChild = require("../spawnInheritChild");
+var _runCommand = require("../runCommand");
 var _Reporter = _interopRequireDefault(require("./Reporter"));
 // The framework reporters live next to the playwright configs, they are resolved
 // from here because this module no longer sits in the same folder as them.
@@ -49,7 +49,7 @@ class PlaywrightReporter extends _Reporter.default {
       reportPath: htmlPath
     } = (0, _readConfigFile.generateConfigFromFile)();
     const args = ['show-report', htmlPath].concat(userArgs);
-    (0, _spawnInheritChild.spawnInheritChild)(command, args, {
+    (0, _runCommand.runCommand)(command, args, {
       exitOnSuccess: true,
       killOnParentExit: true
     });

package/build/core/playwright/reporter/Reporter.js

@@ -1,12 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _configConstants = _interopRequireDefault(require("../constants/configConstants"));
 // Playwright accepts the shard as `current/total`. Anything else (a bare `--shard`
 // flag, for instance) is not a shard run and must keep the default reporters.
 const SHARD_PATTERN = /^\d+\/\d+$/;
@@ -16,8 +13,9 @@ const REPORTER_TYPES = {
 };
 
 /**
- * Base of the report modes. Every mode exposes `getType()` and `getReporter(config)`,
- * `merge()` is implemented by the shard mode alone.
+ * Base of the report modes. Every mode exposes `getType()` and `getReporter(config)`.
+ * `merge()` dispatches through the reporter factory so the CLI does not import a
+ * concrete reporter.
  */
 class Reporter {
   static get TYPES() {
@@ -26,9 +24,6 @@ class Reporter {
   static isShardedRun(shard) {
     return typeof shard === 'string' && SHARD_PATTERN.test(shard);
   }
-  static getBlobReportDir(stage) {
-    return _path.default.join(process.cwd(), _configConstants.default.TEST_SLICE_FOLDER, stage, 'blob-report');
-  }
 
   /**
    * Resolves the report mode to use for a run.
@@ -59,7 +54,7 @@ class Reporter {
     throw new Error('getType() has to be implemented by the reporter');
   }
   static merge() {
-    throw new Error('merge() is supported by the shard reporter alone');
+    return Reporter.getReporterClass(Reporter.TYPES.SHARD).merge();
   }
 }
 exports.default = Reporter;

package/build/core/playwright/reporter/ShardReporter.js

@@ -11,12 +11,16 @@ var _logger = require("../../../utils/logger");
 var _rootPath = require("../../../utils/rootPath");
 var _ConfigurationHelper = require("../configuration/ConfigurationHelper");
 var _UserArgs = _interopRequireDefault(require("../configuration/UserArgs"));
-var _spawnInheritChild = require("../spawnInheritChild");
+var _configConstants = _interopRequireDefault(require("../constants/configConstants"));
+var _runCommand = require("../runCommand");
 var _Reporter = _interopRequireDefault(require("./Reporter"));
 class ShardReporter extends _Reporter.default {
   static getType() {
     return _Reporter.default.TYPES.SHARD;
   }
+  static getBlobReportDir(stage) {
+    return _path.default.join(process.cwd(), _configConstants.default.TEST_SLICE_FOLDER, stage, 'blob-report');
+  }
 
   /**
    * A shard only records its results as a blob. The report files are written once
@@ -29,7 +33,7 @@ class ShardReporter extends _Reporter.default {
     shard
   }) {
     return [['blob', {
-      outputDir: _Reporter.default.getBlobReportDir(stage),
+      outputDir: ShardReporter.getBlobReportDir(stage),
       fileName: `report-${shard.replace('/', '-')}.zip`
     }], ['list']];
   }
@@ -39,7 +43,7 @@ class ShardReporter extends _Reporter.default {
     // child reads it back through getRunStage() while loading merge-config.js.
     const stage = _UserArgs.default.parseToObject(process.argv.slice(2)).stage || (0, _ConfigurationHelper.getRunStage)();
     process.env.stage = stage;
-    const blobReportDir = _Reporter.default.getBlobReportDir(stage);
+    const blobReportDir = ShardReporter.getBlobReportDir(stage);
     if (!(0, _fs.existsSync)(blobReportDir)) {
       _logger.Logger.log(_logger.Logger.FAILURE_TYPE, `No blob reports found at ${blobReportDir} for stage "${stage}". Run the tests with --shard first (Usage: -- --shard=1/4)`);
       process.exit(1);
@@ -49,7 +53,7 @@ class ShardReporter extends _Reporter.default {
     const command = playwrightPath;
     const configPath = _path.default.resolve(__dirname, '../', 'setup', 'merge-config.js');
     const args = ['merge-reports', blobReportDir, '--config', require.resolve(configPath)];
-    (0, _spawnInheritChild.spawnInheritChild)(command, args, {
+    (0, _runCommand.runCommand)(command, args, {
       successMessage: 'Blob Reports Merged Successfully',
       exitOnSuccess: true
     });

package/build/core/playwright/{spawnInheritChild.js → runCommand.js}

@@ -3,10 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.spawnInheritChild = spawnInheritChild;
+exports.runCommand = runCommand;
 var _child_process = require("child_process");
 var _logger = require("../../utils/logger");
-function spawnInheritChild(command, args, options = {}) {
+function runCommand(command, args, options = {}) {
   const {
     successMessage,
     failureMessage,

package/build/core/playwright/runner/SpawnRunner.js

@@ -5,7 +5,7 @@ var _readConfigFile = require("../readConfigFile");
 var _rootPath = require("../../../utils/rootPath");
 var _path = _interopRequireDefault(require("path"));
 var _logger = require("../../../utils/logger");
-var _spawnInheritChild = require("../spawnInheritChild");
+var _runCommand = require("../runCommand");
 var _RunnerHelper = _interopRequireDefault(require("./RunnerHelper"));
 var _Runner = _interopRequireDefault(require("./Runner"));
 var _commonUtils = require("../../../utils/commonUtils");
@@ -63,7 +63,7 @@ class SpawnRunner extends _Runner.default {
       beforeArgs.push('--tags');
       beforeArgs.push(tagArgs);
     }
-    return (0, _spawnInheritChild.spawnInheritChild)(beforeCommand, beforeArgs, {
+    return (0, _runCommand.runCommand)(beforeCommand, beforeArgs, {
       successMessage: 'Feature Files Processed Successfully',
       failureMessage: code => `BddGen exited with code ${code}`
     });
@@ -84,7 +84,7 @@ class SpawnRunner extends _Runner.default {
     const command = playwrightPath;
     const configPath = (0, _readConfigFile.isUserConfigFileAvailable)() ? _path.default.resolve(__dirname, '../', 'setup', 'config-creator.js') : _path.default.resolve('../', '../', '../', '../', 'playwrightConfig.js');
     const args = ['test', '--config', require.resolve(configPath)].concat(playwrightArgs);
-    return (0, _spawnInheritChild.spawnInheritChild)(command, args, {
+    return (0, _runCommand.runCommand)(command, args, {
       successMessage: 'Test Ran Successfully',
       killOnParentExit: true
     });

package/build/core/playwright/setup/qc-custom-reporter.js

@@ -183,7 +183,7 @@ const extractMergedSteps = (rootDir, step) => ({
   ...(step.location && {
     snippet: formSnippet(rootDir, step.location)
   }),
-  ...(step.steps && step.steps.length > 0 && {
+  ...(step.steps && step.steps.length > 0 && step.error && {
     steps: step.steps.map(subStep => extractMergedSteps(rootDir, subStep))
   })
 });

package/build/core/playwright/test-runner.js

@@ -10,7 +10,7 @@ var _path = _interopRequireDefault(require("path"));
 var _envInitializer = require("./env-initializer");
 var _readConfigFile = require("./readConfigFile");
 var _rootPath = require("../../utils/rootPath");
-var _spawnInheritChild = require("./spawnInheritChild");
+var _runCommand = require("./runCommand");
 var _tagProcessor = _interopRequireDefault(require("./tagProcessor"));
 var _ConfigurationHelper = require("./configuration/ConfigurationHelper");
 var _Configuration = _interopRequireDefault(require("./configuration/Configuration"));
@@ -25,7 +25,7 @@ function runPreprocessing(tagArgs, configPath) {
     beforeArgs.push('--tags');
     beforeArgs.push(tagArgs);
   }
-  return (0, _spawnInheritChild.spawnInheritChild)(beforeCommand, beforeArgs, {
+  return (0, _runCommand.runCommand)(beforeCommand, beforeArgs, {
     successMessage: 'Feature Files Processed Successfully',
     failureMessage: code => `BddGen exited with code ${code}`
   });

package/build/lib/cli.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 var _testRunner = _interopRequireDefault(require("../core/playwright/test-runner"));
 var _unitTestingFramework = require("@zohodesk/unit-testing-framework");
 var _PlaywrightReporter = _interopRequireDefault(require("../core/playwright/reporter/PlaywrightReporter"));
-var _ShardReporter = _interopRequireDefault(require("../core/playwright/reporter/ShardReporter"));
+var _Reporter = _interopRequireDefault(require("../core/playwright/reporter/Reporter"));
 var _UnitReporter = _interopRequireDefault(require("../core/playwright/reporter/UnitReporter"));
 var _codegen = _interopRequireDefault(require("../core/playwright/codegen"));
 var _logger = require("../utils/logger");
@@ -59,7 +59,7 @@ switch (option) {
   case 'merge-reports':
     {
       _logger.Logger.log(_logger.Logger.SUCCESS_TYPE, 'Merging Shard Reports...');
-      _ShardReporter.default.merge();
+      _Reporter.default.merge();
       break;
     }
   case 'ut-report':

package/build/test/core/playwright/__tests__/{spawnInheritChild.test.js → runCommand.test.js}

@@ -3,7 +3,7 @@
 var _events = require("events");
 var _child_process = require("child_process");
 var _logger = require("../../../../utils/logger");
-var _spawnInheritChild = require("../../../../core/playwright/spawnInheritChild");
+var _runCommand = require("../../../../core/playwright/runCommand");
 jest.mock('child_process');
 jest.mock('../../../../utils/logger', () => ({
   __esModule: true,
@@ -14,7 +14,7 @@ jest.mock('../../../../utils/logger', () => ({
     INFO_TYPE: 'info'
   }
 }));
-describe('spawnInheritChild', () => {
+describe('runCommand', () => {
   let childProcess;
   let processHandlers;
   let processOnSpy;
@@ -35,7 +35,7 @@ describe('spawnInheritChild', () => {
     processExitSpy.mockRestore();
   });
   it('should spawn the child with the parent stdio and environment', () => {
-    (0, _spawnInheritChild.spawnInheritChild)('playwright', ['test']);
+    (0, _runCommand.runCommand)('playwright', ['test']);
     expect(_child_process.spawn).toHaveBeenCalledWith('playwright', ['test'], {
       stdio: 'inherit',
       env: {
@@ -44,7 +44,7 @@ describe('spawnInheritChild', () => {
     });
   });
   it('should resolve and log the success message when the child exits cleanly', async () => {
-    const promise = (0, _spawnInheritChild.spawnInheritChild)('playwright', ['test'], {
+    const promise = (0, _runCommand.runCommand)('playwright', ['test'], {
       successMessage: 'Test Ran Successfully'
     });
     childProcess.emit('exit', 0, null);
@@ -52,12 +52,12 @@ describe('spawnInheritChild', () => {
     expect(_logger.Logger.log).toHaveBeenCalledWith(_logger.Logger.SUCCESS_TYPE, 'Test Ran Successfully');
   });
   it('should reject with the default message when the child exits with a failure', async () => {
-    const promise = (0, _spawnInheritChild.spawnInheritChild)('playwright', ['test']);
+    const promise = (0, _runCommand.runCommand)('playwright', ['test']);
     childProcess.emit('exit', 1, 'SIGTERM');
     await expect(promise).rejects.toBe('Child Process Exited with Code 1 and Signal SIGTERM');
   });
   it('should reject with the caller message when bddgen exits with a failure', async () => {
-    const promise = (0, _spawnInheritChild.spawnInheritChild)('node', ['bddgen'], {
+    const promise = (0, _runCommand.runCommand)('node', ['bddgen'], {
       failureMessage: code => `BddGen exited with code ${code}`
     });
     childProcess.emit('exit', 2, null);
@@ -65,18 +65,18 @@ describe('spawnInheritChild', () => {
   });
   it('should reject when the child fails to spawn', async () => {
     const error = new Error('spawn ENOENT');
-    const promise = (0, _spawnInheritChild.spawnInheritChild)('playwright', ['test']);
+    const promise = (0, _runCommand.runCommand)('playwright', ['test']);
     childProcess.emit('error', error);
     await expect(promise).rejects.toBe(error);
     expect(_logger.Logger.log).toHaveBeenCalledWith(_logger.Logger.FAILURE_TYPE, error);
   });
   it('should not listen on the parent process unless the caller asks for it', () => {
-    (0, _spawnInheritChild.spawnInheritChild)('node', ['bddgen']);
+    (0, _runCommand.runCommand)('node', ['bddgen']);
     expect(processHandlers.exit).toBeUndefined();
     expect(processHandlers.SIGINT).toBeUndefined();
   });
   it('should kill the child and reject when the run is interrupted', async () => {
-    const promise = (0, _spawnInheritChild.spawnInheritChild)('playwright', ['test'], {
+    const promise = (0, _runCommand.runCommand)('playwright', ['test'], {
       killOnParentExit: true
     });
     processHandlers.SIGINT();
@@ -84,7 +84,7 @@ describe('spawnInheritChild', () => {
     expect(childProcess.kill).toHaveBeenCalled();
   });
   it('should kill the child and reject when the parent exits', async () => {
-    const promise = (0, _spawnInheritChild.spawnInheritChild)('playwright', ['test'], {
+    const promise = (0, _runCommand.runCommand)('playwright', ['test'], {
       killOnParentExit: true
     });
     processHandlers.exit();
@@ -92,7 +92,7 @@ describe('spawnInheritChild', () => {
     expect(childProcess.kill).toHaveBeenCalled();
   });
   it('should log the failure and exit when a CLI child exits with a failure', () => {
-    (0, _spawnInheritChild.spawnInheritChild)('playwright', ['merge-reports'], {
+    (0, _runCommand.runCommand)('playwright', ['merge-reports'], {
       exitOnSuccess: true
     });
     childProcess.emit('exit', 1, 'SIGTERM');
@@ -100,7 +100,7 @@ describe('spawnInheritChild', () => {
     expect(processExitSpy).toHaveBeenCalledWith(1);
   });
   it('should not listen for SIGINT unless the caller owns the child lifetime', () => {
-    (0, _spawnInheritChild.spawnInheritChild)('playwright', ['merge-reports'], {
+    (0, _runCommand.runCommand)('playwright', ['merge-reports'], {
       successMessage: 'Blob Reports Merged Successfully',
       exitOnSuccess: true
     });
@@ -108,14 +108,14 @@ describe('spawnInheritChild', () => {
     expect(processHandlers.exit).toBeUndefined();
   });
   it('should exit with the child when the caller owns the process lifetime', () => {
-    (0, _spawnInheritChild.spawnInheritChild)('playwright', ['show-report'], {
+    (0, _runCommand.runCommand)('playwright', ['show-report'], {
       exitOnSuccess: true
     });
     childProcess.emit('exit', 0, null);
     expect(processExitSpy).toHaveBeenCalledWith(0);
   });
   it('should propagate the child exit code when merge-reports completes', () => {
-    (0, _spawnInheritChild.spawnInheritChild)('playwright', ['merge-reports'], {
+    (0, _runCommand.runCommand)('playwright', ['merge-reports'], {
       successMessage: 'Blob Reports Merged Successfully',
       exitOnSuccess: true
     });
@@ -125,7 +125,7 @@ describe('spawnInheritChild', () => {
   });
   it('should log spawn errors without rejecting a CLI command', () => {
     const error = new Error('spawn ENOENT');
-    (0, _spawnInheritChild.spawnInheritChild)('playwright', ['codegen'], {
+    (0, _runCommand.runCommand)('playwright', ['codegen'], {
       exitOnSuccess: true
     });
     childProcess.emit('error', error);
@@ -133,7 +133,7 @@ describe('spawnInheritChild', () => {
     expect(processExitSpy).not.toHaveBeenCalled();
   });
   it('should kill the child on SIGINT and on the parent exit', () => {
-    (0, _spawnInheritChild.spawnInheritChild)('playwright', ['show-report'], {
+    (0, _runCommand.runCommand)('playwright', ['show-report'], {
       exitOnSuccess: true,
       killOnParentExit: true
     });

package/build/test/core/playwright/helpers/auth/__tests__/checkAuthCookies.test.js

@@ -35,6 +35,22 @@ describe('storeFilteredStorageState', () => {
     await (0, _checkAuthCookies.storeFilteredStorageState)(pageWithCookies(cookies), authFile);
     expect(writtenCookies()).toEqual(cookies);
   });
+  it('keeps the "__Secure-iamsdt" cookie', async () => {
+    const cookies = [{
+      name: '__Secure-iamsdt',
+      value: 's'
+    }];
+    await (0, _checkAuthCookies.storeFilteredStorageState)(pageWithCookies(cookies), authFile);
+    expect(writtenCookies()).toEqual(cookies);
+  });
+  it('keeps the "__Secure-cseziamsdt" cookie', async () => {
+    const cookies = [{
+      name: '__Secure-cseziamsdt',
+      value: 'cs'
+    }];
+    await (0, _checkAuthCookies.storeFilteredStorageState)(pageWithCookies(cookies), authFile);
+    expect(writtenCookies()).toEqual(cookies);
+  });
   it('keeps a cookie whose name has the key as a substring, not just an exact match', async () => {
     const cookies = [{
       name: '_cseziamadt',
@@ -72,9 +88,15 @@ describe('storeFilteredStorageState', () => {
     }, {
       name: '_iambdt',
       value: 'b'
+    }, {
+      name: '__Secure-iamsdt',
+      value: 's'
     }, {
       name: 'JSESSIONID',
       value: 'y'
+    }, {
+      name: '__Secure-cseziamsdt',
+      value: 'cs'
     }];
     await (0, _checkAuthCookies.storeFilteredStorageState)(pageWithCookies(cookies), authFile);
     expect(writtenCookies()).toEqual([{
@@ -83,6 +105,12 @@ describe('storeFilteredStorageState', () => {
     }, {
       name: '_iambdt',
       value: 'b'
+    }, {
+      name: '__Secure-iamsdt',
+      value: 's'
+    }, {
+      name: '__Secure-cseziamsdt',
+      value: 'cs'
     }]);
   });
   it('writes to the given authFile path', async () => {