@cucumber/cucumber 7.1.0 → 7.3.1

package/lib/runtime/attachment_manager/index.js

@@ -1,10 +1,29 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const is_stream_1 = __importDefault(require("is-stream"));
-const messages_1 = require("@cucumber/messages");
+const messages = __importStar(require("@cucumber/messages"));
 const value_checker_1 = require("../../value_checker");
 class AttachmentManager {
     constructor(onAttachment) {
@@ -32,13 +51,13 @@ class AttachmentManager {
             }
             if (mediaType.startsWith('base64:')) {
                 this.createStringAttachment(data, {
-                    encoding: messages_1.messages.Attachment.ContentEncoding.BASE64,
+                    encoding: messages.AttachmentContentEncoding.BASE64,
                     contentType: mediaType.replace('base64:', ''),
                 });
             }
             else {
                 this.createStringAttachment(data, {
-                    encoding: messages_1.messages.Attachment.ContentEncoding.IDENTITY,
+                    encoding: messages.AttachmentContentEncoding.IDENTITY,
                     contentType: mediaType,
                 });
             }
@@ -49,7 +68,7 @@ class AttachmentManager {
     }
     createBufferAttachment(data, mediaType) {
         this.createStringAttachment(data.toString('base64'), {
-            encoding: messages_1.messages.Attachment.ContentEncoding.BASE64,
+            encoding: messages.AttachmentContentEncoding.BASE64,
             contentType: mediaType,
         });
     }

package/lib/runtime/attachment_manager/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/runtime/attachment_manager/index.ts"],"names":[],"mappings":"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","sourcesContent":["import isStream from 'is-stream'\nimport { Readable } from 'stream'\nimport { messages } from '@cucumber/messages'\nimport { doesHaveValue, doesNotHaveValue } from '../../value_checker'\n\nexport interface IAttachmentMedia {\n  encoding: messages.Attachment.ContentEncoding\n  contentType: string\n}\n\nexport interface IAttachment {\n  data: string\n  media: IAttachmentMedia\n}\n\nexport type IAttachFunction = (attachment: IAttachment) => void\nexport type ICreateAttachment = (\n  data: Buffer | Readable | string,\n  mediaType?: string,\n  callback?: () => void\n) => void | Promise<void>\nexport type ICreateLog = (text: string) => void | Promise<void>\n\nexport default class AttachmentManager {\n  private readonly onAttachment: IAttachFunction\n\n  constructor(onAttachment: IAttachFunction) {\n    this.onAttachment = onAttachment\n  }\n\n  log(text: string): void | Promise<void> {\n    return this.create(text, 'text/x.cucumber.log+plain')\n  }\n\n  create(\n    data: Buffer | Readable | string,\n    mediaType?: string,\n    callback?: () => void\n  ): void | Promise<void> {\n    if (Buffer.isBuffer(data)) {\n      if (doesNotHaveValue(mediaType)) {\n        throw Error('Buffer attachments must specify a media type')\n      }\n      this.createBufferAttachment(data, mediaType)\n    } else if (isStream.readable(data)) {\n      if (doesNotHaveValue(mediaType)) {\n        throw Error('Stream attachments must specify a media type')\n      }\n      return this.createStreamAttachment(data, mediaType, callback)\n    } else if (typeof data === 'string') {\n      if (doesNotHaveValue(mediaType)) {\n        mediaType = 'text/plain'\n      }\n      if (mediaType.startsWith('base64:')) {\n        this.createStringAttachment(data, {\n          encoding: messages.Attachment.ContentEncoding.BASE64,\n          contentType: mediaType.replace('base64:', ''),\n        })\n      } else {\n        this.createStringAttachment(data, {\n          encoding: messages.Attachment.ContentEncoding.IDENTITY,\n          contentType: mediaType,\n        })\n      }\n    } else {\n      throw Error(\n        'Invalid attachment data: must be a buffer, readable stream, or string'\n      )\n    }\n  }\n\n  createBufferAttachment(data: Buffer, mediaType: string): void {\n    this.createStringAttachment(data.toString('base64'), {\n      encoding: messages.Attachment.ContentEncoding.BASE64,\n      contentType: mediaType,\n    })\n  }\n\n  createStreamAttachment(\n    data: Readable,\n    mediaType: string,\n    callback: () => void\n  ): void | Promise<void> {\n    const promise = new Promise<void>((resolve, reject) => {\n      const buffers: Uint8Array[] = []\n      data.on('data', (chunk) => {\n        buffers.push(chunk)\n      })\n      data.on('end', () => {\n        this.createBufferAttachment(Buffer.concat(buffers), mediaType)\n        resolve()\n      })\n      data.on('error', reject)\n    })\n    if (doesHaveValue(callback)) {\n      promise.then(callback, callback)\n    } else {\n      return promise\n    }\n  }\n\n  createStringAttachment(data: string, media: IAttachmentMedia): void {\n    this.onAttachment({ data, media })\n  }\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/runtime/attachment_manager/index.ts"],"names":[],"mappings":"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","sourcesContent":["import isStream from 'is-stream'\nimport { Readable } from 'stream'\nimport * as messages from '@cucumber/messages'\nimport { doesHaveValue, doesNotHaveValue } from '../../value_checker'\n\nexport interface IAttachmentMedia {\n  encoding: messages.AttachmentContentEncoding\n  contentType: string\n}\n\nexport interface IAttachment {\n  data: string\n  media: IAttachmentMedia\n}\n\nexport type IAttachFunction = (attachment: IAttachment) => void\nexport type ICreateAttachment = (\n  data: Buffer | Readable | string,\n  mediaType?: string,\n  callback?: () => void\n) => void | Promise<void>\nexport type ICreateLog = (text: string) => void | Promise<void>\n\nexport default class AttachmentManager {\n  private readonly onAttachment: IAttachFunction\n\n  constructor(onAttachment: IAttachFunction) {\n    this.onAttachment = onAttachment\n  }\n\n  log(text: string): void | Promise<void> {\n    return this.create(text, 'text/x.cucumber.log+plain')\n  }\n\n  create(\n    data: Buffer | Readable | string,\n    mediaType?: string,\n    callback?: () => void\n  ): void | Promise<void> {\n    if (Buffer.isBuffer(data)) {\n      if (doesNotHaveValue(mediaType)) {\n        throw Error('Buffer attachments must specify a media type')\n      }\n      this.createBufferAttachment(data, mediaType)\n    } else if (isStream.readable(data)) {\n      if (doesNotHaveValue(mediaType)) {\n        throw Error('Stream attachments must specify a media type')\n      }\n      return this.createStreamAttachment(data, mediaType, callback)\n    } else if (typeof data === 'string') {\n      if (doesNotHaveValue(mediaType)) {\n        mediaType = 'text/plain'\n      }\n      if (mediaType.startsWith('base64:')) {\n        this.createStringAttachment(data, {\n          encoding: messages.AttachmentContentEncoding.BASE64,\n          contentType: mediaType.replace('base64:', ''),\n        })\n      } else {\n        this.createStringAttachment(data, {\n          encoding: messages.AttachmentContentEncoding.IDENTITY,\n          contentType: mediaType,\n        })\n      }\n    } else {\n      throw Error(\n        'Invalid attachment data: must be a buffer, readable stream, or string'\n      )\n    }\n  }\n\n  createBufferAttachment(data: Buffer, mediaType: string): void {\n    this.createStringAttachment(data.toString('base64'), {\n      encoding: messages.AttachmentContentEncoding.BASE64,\n      contentType: mediaType,\n    })\n  }\n\n  createStreamAttachment(\n    data: Readable,\n    mediaType: string,\n    callback: () => void\n  ): void | Promise<void> {\n    const promise = new Promise<void>((resolve, reject) => {\n      const buffers: Uint8Array[] = []\n      data.on('data', (chunk) => {\n        buffers.push(chunk)\n      })\n      data.on('end', () => {\n        this.createBufferAttachment(Buffer.concat(buffers), mediaType)\n        resolve()\n      })\n      data.on('error', reject)\n    })\n    if (doesHaveValue(callback)) {\n      promise.then(callback, callback)\n    } else {\n      return promise\n    }\n  }\n\n  createStringAttachment(data: string, media: IAttachmentMedia): void {\n    this.onAttachment({ data, media })\n  }\n}\n"]}

package/lib/runtime/helpers.d.ts

@@ -1,5 +1,5 @@
 import StepDefinition from '../models/step_definition';
-import { messages } from '@cucumber/messages';
+import * as messages from '@cucumber/messages';
 import { IRuntimeOptions } from '.';
 export declare function getAmbiguousStepException(stepDefinitions: StepDefinition[]): string;
-export declare function retriesForPickle(pickle: messages.IPickle, options: IRuntimeOptions): number;
+export declare function retriesForPickle(pickle: messages.Pickle, options: IRuntimeOptions): number;

package/lib/runtime/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/runtime/helpers.ts"],"names":[],"mappings":";;;;;;AAAA,4EAAsE;AACtE,4DAA8B;AAC9B,kEAAwC;AACxC,oDAAkD;AAKlD,SAAgB,yBAAyB,CACvC,eAAiC;IAEjC,MAAM,KAAK,GAAG,IAAI,oBAAK,CAAC;QACtB,KAAK,EAAE;YACL,MAAM,EAAE,EAAE;YACV,aAAa,EAAE,EAAE;YACjB,YAAY,EAAE,EAAE;YAChB,cAAc,EAAE,EAAE;YAClB,IAAI,EAAE,EAAE;YACR,UAAU,EAAE,EAAE;YACd,GAAG,EAAE,EAAE;YACP,SAAS,EAAE,EAAE;YACb,MAAM,EAAE,KAAK;YACb,KAAK,EAAE,EAAE;YACT,WAAW,EAAE,EAAE;YACf,GAAG,EAAE,EAAE;YACP,UAAU,EAAE,EAAE;YACd,SAAS,EAAE,EAAE;YACb,WAAW,EAAE,EAAE;SAChB;QACD,KAAK,EAAE;YACL,MAAM,EAAE,EAAE;YACV,cAAc,EAAE,CAAC;YACjB,eAAe,EAAE,CAAC;SACnB;KACF,CAAC,CAAA;IACF,KAAK,CAAC,IAAI,CACR,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE;QACxC,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAA;QACjD,OAAO,CAAC,OAAO,EAAE,iCAAc,CAAC,cAAc,CAAC,CAAC,CAAA;IAClD,CAAC,CAAC,CACH,CAAA;IACD,OAAO,GAAG,kCAAkC,GAAG,IAAI,GAAG,uBAAY,CAChE,KAAK,CAAC,QAAQ,EAAE,EAChB,CAAC,CACF,EAAE,CAAA;AACL,CAAC;AArCD,8DAqCC;AAED,SAAgB,gBAAgB,CAC9B,MAAwB,EACxB,OAAwB;IAExB,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAA;IAC7B,IAAI,OAAO,KAAK,CAAC,EAAE;QACjB,OAAO,CAAC,CAAA;KACT;IACD,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,CAAA;IAC7C,IAAI,cAAc,KAAK,EAAE,EAAE;QACzB,OAAO,OAAO,CAAA;KACf;IACD,MAAM,eAAe,GAAG,IAAI,+BAAe,CAAC,cAAc,CAAC,CAAA;IAC3D,IAAI,eAAe,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE;QACpD,OAAO,OAAO,CAAA;KACf;IACD,OAAO,CAAC,CAAA;AACV,CAAC;AAjBD,4CAiBC","sourcesContent":["import { formatLocation } from '../formatter/helpers/location_helpers'\nimport Table from 'cli-table3'\nimport indentString from 'indent-string'\nimport { PickleTagFilter } from '../pickle_filter'\nimport StepDefinition from '../models/step_definition'\nimport { messages } from '@cucumber/messages'\nimport { IRuntimeOptions } from '.'\n\nexport function getAmbiguousStepException(\n  stepDefinitions: StepDefinition[]\n): string {\n  const table = new Table({\n    chars: {\n      bottom: '',\n      'bottom-left': '',\n      'bottom-mid': '',\n      'bottom-right': '',\n      left: '',\n      'left-mid': '',\n      mid: '',\n      'mid-mid': '',\n      middle: ' - ',\n      right: '',\n      'right-mid': '',\n      top: '',\n      'top-left': '',\n      'top-mid': '',\n      'top-right': '',\n    },\n    style: {\n      border: [],\n      'padding-left': 0,\n      'padding-right': 0,\n    },\n  })\n  table.push(\n    ...stepDefinitions.map((stepDefinition) => {\n      const pattern = stepDefinition.pattern.toString()\n      return [pattern, formatLocation(stepDefinition)]\n    })\n  )\n  return `${'Multiple step definitions match:' + '\\n'}${indentString(\n    table.toString(),\n    2\n  )}`\n}\n\nexport function retriesForPickle(\n  pickle: messages.IPickle,\n  options: IRuntimeOptions\n): number {\n  const retries = options.retry\n  if (retries === 0) {\n    return 0\n  }\n  const retryTagFilter = options.retryTagFilter\n  if (retryTagFilter === '') {\n    return retries\n  }\n  const pickleTagFilter = new PickleTagFilter(retryTagFilter)\n  if (pickleTagFilter.matchesAllTagExpressions(pickle)) {\n    return retries\n  }\n  return 0\n}\n"]}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/runtime/helpers.ts"],"names":[],"mappings":";;;;;;AAAA,4EAAsE;AACtE,4DAA8B;AAC9B,kEAAwC;AACxC,oDAAkD;AAKlD,SAAgB,yBAAyB,CACvC,eAAiC;IAEjC,MAAM,KAAK,GAAG,IAAI,oBAAK,CAAC;QACtB,KAAK,EAAE;YACL,MAAM,EAAE,EAAE;YACV,aAAa,EAAE,EAAE;YACjB,YAAY,EAAE,EAAE;YAChB,cAAc,EAAE,EAAE;YAClB,IAAI,EAAE,EAAE;YACR,UAAU,EAAE,EAAE;YACd,GAAG,EAAE,EAAE;YACP,SAAS,EAAE,EAAE;YACb,MAAM,EAAE,KAAK;YACb,KAAK,EAAE,EAAE;YACT,WAAW,EAAE,EAAE;YACf,GAAG,EAAE,EAAE;YACP,UAAU,EAAE,EAAE;YACd,SAAS,EAAE,EAAE;YACb,WAAW,EAAE,EAAE;SAChB;QACD,KAAK,EAAE;YACL,MAAM,EAAE,EAAE;YACV,cAAc,EAAE,CAAC;YACjB,eAAe,EAAE,CAAC;SACnB;KACF,CAAC,CAAA;IACF,KAAK,CAAC,IAAI,CACR,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE;QACxC,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAA;QACjD,OAAO,CAAC,OAAO,EAAE,iCAAc,CAAC,cAAc,CAAC,CAAC,CAAA;IAClD,CAAC,CAAC,CACH,CAAA;IACD,OAAO,GAAG,kCAAkC,GAAG,IAAI,GAAG,uBAAY,CAChE,KAAK,CAAC,QAAQ,EAAE,EAChB,CAAC,CACF,EAAE,CAAA;AACL,CAAC;AArCD,8DAqCC;AAED,SAAgB,gBAAgB,CAC9B,MAAuB,EACvB,OAAwB;IAExB,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAA;IAC7B,IAAI,OAAO,KAAK,CAAC,EAAE;QACjB,OAAO,CAAC,CAAA;KACT;IACD,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,CAAA;IAC7C,IAAI,cAAc,KAAK,EAAE,EAAE;QACzB,OAAO,OAAO,CAAA;KACf;IACD,MAAM,eAAe,GAAG,IAAI,+BAAe,CAAC,cAAc,CAAC,CAAA;IAC3D,IAAI,eAAe,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE;QACpD,OAAO,OAAO,CAAA;KACf;IACD,OAAO,CAAC,CAAA;AACV,CAAC;AAjBD,4CAiBC","sourcesContent":["import { formatLocation } from '../formatter/helpers/location_helpers'\nimport Table from 'cli-table3'\nimport indentString from 'indent-string'\nimport { PickleTagFilter } from '../pickle_filter'\nimport StepDefinition from '../models/step_definition'\nimport * as messages from '@cucumber/messages'\nimport { IRuntimeOptions } from '.'\n\nexport function getAmbiguousStepException(\n  stepDefinitions: StepDefinition[]\n): string {\n  const table = new Table({\n    chars: {\n      bottom: '',\n      'bottom-left': '',\n      'bottom-mid': '',\n      'bottom-right': '',\n      left: '',\n      'left-mid': '',\n      mid: '',\n      'mid-mid': '',\n      middle: ' - ',\n      right: '',\n      'right-mid': '',\n      top: '',\n      'top-left': '',\n      'top-mid': '',\n      'top-right': '',\n    },\n    style: {\n      border: [],\n      'padding-left': 0,\n      'padding-right': 0,\n    },\n  })\n  table.push(\n    ...stepDefinitions.map((stepDefinition) => {\n      const pattern = stepDefinition.pattern.toString()\n      return [pattern, formatLocation(stepDefinition)]\n    })\n  )\n  return `${'Multiple step definitions match:' + '\\n'}${indentString(\n    table.toString(),\n    2\n  )}`\n}\n\nexport function retriesForPickle(\n  pickle: messages.Pickle,\n  options: IRuntimeOptions\n): number {\n  const retries = options.retry\n  if (retries === 0) {\n    return 0\n  }\n  const retryTagFilter = options.retryTagFilter\n  if (retryTagFilter === '') {\n    return retries\n  }\n  const pickleTagFilter = new PickleTagFilter(retryTagFilter)\n  if (pickleTagFilter.matchesAllTagExpressions(pickle)) {\n    return retries\n  }\n  return 0\n}\n"]}

package/lib/runtime/index.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { EventDataCollector } from '../formatter/helpers';
-import { IdGenerator, messages } from '@cucumber/messages';
+import { IdGenerator } from '@cucumber/messages';
+import * as messages from '@cucumber/messages';
 import { EventEmitter } from 'events';
 import { ISupportCodeLibrary } from '../support_code_library_builder/types';
 import TestRunHookDefinition from '../models/test_run_hook_definition';
@@ -34,7 +35,7 @@ export default class Runtime {
     private success;
     constructor({ eventBroadcaster, eventDataCollector, newId, options, pickleIds, supportCodeLibrary, }: INewRuntimeOptions);
     runTestRunHooks(definitions: TestRunHookDefinition[], name: string): Promise<void>;
-    runPickle(pickleId: string): Promise<void>;
+    runTestCase(pickleId: string, testCase: messages.TestCase): Promise<void>;
     start(): Promise<boolean>;
-    shouldCauseFailure(status: messages.TestStepFinished.TestStepResult.Status): boolean;
+    shouldCauseFailure(status: messages.TestStepResultStatus): boolean;
 }

package/lib/runtime/index.js

@@ -26,14 +26,14 @@ const lodash_1 = __importStar(require("lodash"));
 const helpers_1 = require("../formatter/helpers");
 const bluebird_1 = __importDefault(require("bluebird"));
 const stack_trace_filter_1 = __importDefault(require("../stack_trace_filter"));
-const status_1 = __importDefault(require("../status"));
 const user_code_runner_1 = __importDefault(require("../user_code_runner"));
 const verror_1 = __importDefault(require("verror"));
 const helpers_2 = require("./helpers");
-const messages_1 = require("@cucumber/messages");
-const pickle_runner_1 = __importDefault(require("./pickle_runner"));
+const messages = __importStar(require("@cucumber/messages"));
+const test_case_runner_1 = __importDefault(require("./test_case_runner"));
 const value_checker_1 = require("../value_checker");
 const stopwatch_1 = require("./stopwatch");
+const assemble_test_cases_1 = require("./assemble_test_cases");
 class Runtime {
     constructor({ eventBroadcaster, eventDataCollector, newId, options, pickleIds, supportCodeLibrary, }) {
         this.eventBroadcaster = eventBroadcaster;
@@ -65,22 +65,23 @@ class Runtime {
             }
         });
     }
-    async runPickle(pickleId) {
+    async runTestCase(pickleId, testCase) {
         const pickle = this.eventDataCollector.getPickle(pickleId);
         const retries = helpers_2.retriesForPickle(pickle, this.options);
         const skip = this.options.dryRun || (this.options.failFast && !this.success);
-        const pickleRunner = new pickle_runner_1.default({
+        const testCaseRunner = new test_case_runner_1.default({
             eventBroadcaster: this.eventBroadcaster,
             stopwatch: this.stopwatch,
             gherkinDocument: this.eventDataCollector.getGherkinDocument(pickle.uri),
             newId: this.newId,
             pickle,
+            testCase,
             retries,
             skip,
             supportCodeLibrary: this.supportCodeLibrary,
             worldParameters: this.options.worldParameters,
         });
-        const status = await pickleRunner.run();
+        const status = await testCaseRunner.run();
         if (this.shouldCauseFailure(status)) {
             this.success = false;
         }
@@ -89,29 +90,46 @@ class Runtime {
         if (this.options.filterStacktraces) {
             this.stackTraceFilter.filter();
         }
-        this.eventBroadcaster.emit('envelope', new messages_1.messages.Envelope({
+        const testRunStarted = {
             testRunStarted: {
                 timestamp: this.stopwatch.timestamp(),
             },
-        }));
+        };
+        this.eventBroadcaster.emit('envelope', testRunStarted);
         this.stopwatch.start();
         await this.runTestRunHooks(this.supportCodeLibrary.beforeTestRunHookDefinitions, 'a BeforeAll');
-        await bluebird_1.default.each(this.pickleIds, this.runPickle.bind(this));
+        const assembledTestCases = await assemble_test_cases_1.assembleTestCases({
+            eventBroadcaster: this.eventBroadcaster,
+            newId: this.newId,
+            pickles: this.pickleIds.map((pickleId) => this.eventDataCollector.getPickle(pickleId)),
+            supportCodeLibrary: this.supportCodeLibrary,
+        });
+        await bluebird_1.default.each(this.pickleIds, async (pickleId) => {
+            await this.runTestCase(pickleId, assembledTestCases[pickleId]);
+        });
         await this.runTestRunHooks(lodash_1.clone(this.supportCodeLibrary.afterTestRunHookDefinitions).reverse(), 'an AfterAll');
         this.stopwatch.stop();
-        this.eventBroadcaster.emit('envelope', messages_1.messages.Envelope.fromObject({
+        const testRunFinished = {
             testRunFinished: {
                 timestamp: this.stopwatch.timestamp(),
+                success: this.success,
             },
-        }));
+        };
+        this.eventBroadcaster.emit('envelope', testRunFinished);
         if (this.options.filterStacktraces) {
             this.stackTraceFilter.unfilter();
         }
         return this.success;
     }
     shouldCauseFailure(status) {
-        return (lodash_1.default.includes([status_1.default.AMBIGUOUS, status_1.default.FAILED, status_1.default.UNDEFINED], status) ||
-            (status === status_1.default.PENDING && this.options.strict));
+        const failureStatuses = [
+            messages.TestStepResultStatus.AMBIGUOUS,
+            messages.TestStepResultStatus.FAILED,
+            messages.TestStepResultStatus.UNDEFINED,
+        ];
+        if (this.options.strict)
+            failureStatuses.push(messages.TestStepResultStatus.PENDING);
+        return lodash_1.default.includes(failureStatuses, status);
     }
 }
 exports.default = Runtime;

package/lib/runtime/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"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","sourcesContent":["import _, { clone } from 'lodash'\nimport { EventDataCollector, formatLocation } from '../formatter/helpers'\nimport bluebird from 'bluebird'\nimport StackTraceFilter from '../stack_trace_filter'\nimport Status from '../status'\nimport UserCodeRunner from '../user_code_runner'\nimport VError from 'verror'\nimport { retriesForPickle } from './helpers'\nimport { IdGenerator, messages } from '@cucumber/messages'\nimport PickleRunner from './pickle_runner'\nimport { EventEmitter } from 'events'\nimport { ISupportCodeLibrary } from '../support_code_library_builder/types'\nimport TestRunHookDefinition from '../models/test_run_hook_definition'\nimport { doesHaveValue, valueOrDefault } from '../value_checker'\nimport {\n  ITestRunStopwatch,\n  PredictableTestRunStopwatch,\n  RealTestRunStopwatch,\n} from './stopwatch'\n\nexport interface INewRuntimeOptions {\n  eventBroadcaster: EventEmitter\n  eventDataCollector: EventDataCollector\n  newId: IdGenerator.NewId\n  options: IRuntimeOptions\n  pickleIds: string[]\n  supportCodeLibrary: ISupportCodeLibrary\n}\n\nexport interface IRuntimeOptions {\n  dryRun: boolean\n  predictableIds: boolean\n  failFast: boolean\n  filterStacktraces: boolean\n  retry: number\n  retryTagFilter: string\n  strict: boolean\n  worldParameters: any\n}\n\nexport default class Runtime {\n  private readonly eventBroadcaster: EventEmitter\n  private readonly eventDataCollector: EventDataCollector\n  private readonly stopwatch: ITestRunStopwatch\n  private readonly newId: IdGenerator.NewId\n  private readonly options: IRuntimeOptions\n  private readonly pickleIds: string[]\n  private readonly stackTraceFilter: StackTraceFilter\n  private readonly supportCodeLibrary: ISupportCodeLibrary\n  private success: boolean\n\n  constructor({\n    eventBroadcaster,\n    eventDataCollector,\n    newId,\n    options,\n    pickleIds,\n    supportCodeLibrary,\n  }: INewRuntimeOptions) {\n    this.eventBroadcaster = eventBroadcaster\n    this.eventDataCollector = eventDataCollector\n    this.stopwatch = options.predictableIds\n      ? new PredictableTestRunStopwatch()\n      : new RealTestRunStopwatch()\n    this.newId = newId\n    this.options = options\n    this.pickleIds = pickleIds\n    this.stackTraceFilter = new StackTraceFilter()\n    this.supportCodeLibrary = supportCodeLibrary\n    this.success = true\n  }\n\n  async runTestRunHooks(\n    definitions: TestRunHookDefinition[],\n    name: string\n  ): Promise<void> {\n    if (this.options.dryRun) {\n      return\n    }\n    await bluebird.each(\n      definitions,\n      async (hookDefinition: TestRunHookDefinition) => {\n        const { error } = await UserCodeRunner.run({\n          argsArray: [],\n          fn: hookDefinition.code,\n          thisArg: null,\n          timeoutInMilliseconds: valueOrDefault(\n            hookDefinition.options.timeout,\n            this.supportCodeLibrary.defaultTimeout\n          ),\n        })\n        if (doesHaveValue(error)) {\n          const location = formatLocation(hookDefinition)\n          throw new VError(\n            error,\n            `${name} hook errored, process exiting: ${location}`\n          )\n        }\n      }\n    )\n  }\n\n  async runPickle(pickleId: string): Promise<void> {\n    const pickle = this.eventDataCollector.getPickle(pickleId)\n    const retries = retriesForPickle(pickle, this.options)\n    const skip = this.options.dryRun || (this.options.failFast && !this.success)\n    const pickleRunner = new PickleRunner({\n      eventBroadcaster: this.eventBroadcaster,\n      stopwatch: this.stopwatch,\n      gherkinDocument: this.eventDataCollector.getGherkinDocument(pickle.uri),\n      newId: this.newId,\n      pickle,\n      retries,\n      skip,\n      supportCodeLibrary: this.supportCodeLibrary,\n      worldParameters: this.options.worldParameters,\n    })\n    const status = await pickleRunner.run()\n    if (this.shouldCauseFailure(status)) {\n      this.success = false\n    }\n  }\n\n  async start(): Promise<boolean> {\n    if (this.options.filterStacktraces) {\n      this.stackTraceFilter.filter()\n    }\n    this.eventBroadcaster.emit(\n      'envelope',\n      new messages.Envelope({\n        testRunStarted: {\n          timestamp: this.stopwatch.timestamp(),\n        },\n      })\n    )\n    this.stopwatch.start()\n    await this.runTestRunHooks(\n      this.supportCodeLibrary.beforeTestRunHookDefinitions,\n      'a BeforeAll'\n    )\n    await bluebird.each(this.pickleIds, this.runPickle.bind(this))\n    await this.runTestRunHooks(\n      clone(this.supportCodeLibrary.afterTestRunHookDefinitions).reverse(),\n      'an AfterAll'\n    )\n    this.stopwatch.stop()\n    this.eventBroadcaster.emit(\n      'envelope',\n      messages.Envelope.fromObject({\n        testRunFinished: {\n          timestamp: this.stopwatch.timestamp(),\n        },\n      })\n    )\n    if (this.options.filterStacktraces) {\n      this.stackTraceFilter.unfilter()\n    }\n    return this.success\n  }\n\n  shouldCauseFailure(\n    status: messages.TestStepFinished.TestStepResult.Status\n  ): boolean {\n    return (\n      _.includes([Status.AMBIGUOUS, Status.FAILED, Status.UNDEFINED], status) ||\n      (status === Status.PENDING && this.options.strict)\n    )\n  }\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"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","sourcesContent":["import _, { clone } from 'lodash'\nimport { EventDataCollector, formatLocation } from '../formatter/helpers'\nimport bluebird from 'bluebird'\nimport StackTraceFilter from '../stack_trace_filter'\nimport UserCodeRunner from '../user_code_runner'\nimport VError from 'verror'\nimport { retriesForPickle } from './helpers'\nimport { IdGenerator } from '@cucumber/messages'\nimport * as messages from '@cucumber/messages'\nimport TestCaseRunner from './test_case_runner'\nimport { EventEmitter } from 'events'\nimport { ISupportCodeLibrary } from '../support_code_library_builder/types'\nimport TestRunHookDefinition from '../models/test_run_hook_definition'\nimport { doesHaveValue, valueOrDefault } from '../value_checker'\nimport {\n  ITestRunStopwatch,\n  PredictableTestRunStopwatch,\n  RealTestRunStopwatch,\n} from './stopwatch'\nimport { assembleTestCases } from './assemble_test_cases'\n\nexport interface INewRuntimeOptions {\n  eventBroadcaster: EventEmitter\n  eventDataCollector: EventDataCollector\n  newId: IdGenerator.NewId\n  options: IRuntimeOptions\n  pickleIds: string[]\n  supportCodeLibrary: ISupportCodeLibrary\n}\n\nexport interface IRuntimeOptions {\n  dryRun: boolean\n  predictableIds: boolean\n  failFast: boolean\n  filterStacktraces: boolean\n  retry: number\n  retryTagFilter: string\n  strict: boolean\n  worldParameters: any\n}\n\nexport default class Runtime {\n  private readonly eventBroadcaster: EventEmitter\n  private readonly eventDataCollector: EventDataCollector\n  private readonly stopwatch: ITestRunStopwatch\n  private readonly newId: IdGenerator.NewId\n  private readonly options: IRuntimeOptions\n  private readonly pickleIds: string[]\n  private readonly stackTraceFilter: StackTraceFilter\n  private readonly supportCodeLibrary: ISupportCodeLibrary\n  private success: boolean\n\n  constructor({\n    eventBroadcaster,\n    eventDataCollector,\n    newId,\n    options,\n    pickleIds,\n    supportCodeLibrary,\n  }: INewRuntimeOptions) {\n    this.eventBroadcaster = eventBroadcaster\n    this.eventDataCollector = eventDataCollector\n    this.stopwatch = options.predictableIds\n      ? new PredictableTestRunStopwatch()\n      : new RealTestRunStopwatch()\n    this.newId = newId\n    this.options = options\n    this.pickleIds = pickleIds\n    this.stackTraceFilter = new StackTraceFilter()\n    this.supportCodeLibrary = supportCodeLibrary\n    this.success = true\n  }\n\n  async runTestRunHooks(\n    definitions: TestRunHookDefinition[],\n    name: string\n  ): Promise<void> {\n    if (this.options.dryRun) {\n      return\n    }\n    await bluebird.each(\n      definitions,\n      async (hookDefinition: TestRunHookDefinition) => {\n        const { error } = await UserCodeRunner.run({\n          argsArray: [],\n          fn: hookDefinition.code,\n          thisArg: null,\n          timeoutInMilliseconds: valueOrDefault(\n            hookDefinition.options.timeout,\n            this.supportCodeLibrary.defaultTimeout\n          ),\n        })\n        if (doesHaveValue(error)) {\n          const location = formatLocation(hookDefinition)\n          throw new VError(\n            error,\n            `${name} hook errored, process exiting: ${location}`\n          )\n        }\n      }\n    )\n  }\n\n  async runTestCase(\n    pickleId: string,\n    testCase: messages.TestCase\n  ): Promise<void> {\n    const pickle = this.eventDataCollector.getPickle(pickleId)\n    const retries = retriesForPickle(pickle, this.options)\n    const skip = this.options.dryRun || (this.options.failFast && !this.success)\n    const testCaseRunner = new TestCaseRunner({\n      eventBroadcaster: this.eventBroadcaster,\n      stopwatch: this.stopwatch,\n      gherkinDocument: this.eventDataCollector.getGherkinDocument(pickle.uri),\n      newId: this.newId,\n      pickle,\n      testCase,\n      retries,\n      skip,\n      supportCodeLibrary: this.supportCodeLibrary,\n      worldParameters: this.options.worldParameters,\n    })\n    const status = await testCaseRunner.run()\n    if (this.shouldCauseFailure(status)) {\n      this.success = false\n    }\n  }\n\n  async start(): Promise<boolean> {\n    if (this.options.filterStacktraces) {\n      this.stackTraceFilter.filter()\n    }\n    const testRunStarted: messages.Envelope = {\n      testRunStarted: {\n        timestamp: this.stopwatch.timestamp(),\n      },\n    }\n    this.eventBroadcaster.emit('envelope', testRunStarted)\n    this.stopwatch.start()\n    await this.runTestRunHooks(\n      this.supportCodeLibrary.beforeTestRunHookDefinitions,\n      'a BeforeAll'\n    )\n    const assembledTestCases = await assembleTestCases({\n      eventBroadcaster: this.eventBroadcaster,\n      newId: this.newId,\n      pickles: this.pickleIds.map((pickleId) =>\n        this.eventDataCollector.getPickle(pickleId)\n      ),\n      supportCodeLibrary: this.supportCodeLibrary,\n    })\n    await bluebird.each(this.pickleIds, async (pickleId) => {\n      await this.runTestCase(pickleId, assembledTestCases[pickleId])\n    })\n    await this.runTestRunHooks(\n      clone(this.supportCodeLibrary.afterTestRunHookDefinitions).reverse(),\n      'an AfterAll'\n    )\n    this.stopwatch.stop()\n    const testRunFinished: messages.Envelope = {\n      testRunFinished: {\n        timestamp: this.stopwatch.timestamp(),\n        success: this.success,\n      },\n    }\n    this.eventBroadcaster.emit('envelope', testRunFinished)\n    if (this.options.filterStacktraces) {\n      this.stackTraceFilter.unfilter()\n    }\n    return this.success\n  }\n\n  shouldCauseFailure(status: messages.TestStepResultStatus): boolean {\n    const failureStatuses: messages.TestStepResultStatus[] = [\n      messages.TestStepResultStatus.AMBIGUOUS,\n      messages.TestStepResultStatus.FAILED,\n      messages.TestStepResultStatus.UNDEFINED,\n    ]\n    if (this.options.strict)\n      failureStatuses.push(messages.TestStepResultStatus.PENDING)\n    return _.includes(failureStatuses, status)\n  }\n}\n"]}

package/lib/runtime/parallel/command_types.d.ts

@@ -1,4 +1,4 @@
-import { messages } from '@cucumber/messages';
+import * as messages from '@cucumber/messages';
 import { IRuntimeOptions } from '../index';
 export interface IWorkerCommand {
     initialize?: IWorkerCommandInitialize;
@@ -9,22 +9,23 @@ export interface IWorkerCommandInitialize {
     filterStacktraces: boolean;
     supportCodePaths: string[];
     supportCodeRequiredModules: string[];
+    supportCodeIds?: ICanonicalSupportCodeIds;
     options: IRuntimeOptions;
 }
+export interface ICanonicalSupportCodeIds {
+    stepDefinitionIds: string[];
+    beforeTestCaseHookDefinitionIds: string[];
+    afterTestCaseHookDefinitionIds: string[];
+}
 export interface IWorkerCommandRun {
     retries: number;
     skip: boolean;
     elapsed: number;
-    pickle: messages.IPickle;
-    gherkinDocument: messages.IGherkinDocument;
+    pickle: messages.Pickle;
+    testCase: messages.TestCase;
+    gherkinDocument: messages.GherkinDocument;
 }
 export interface ICoordinatorReport {
     jsonEnvelope?: string;
     ready?: boolean;
-    supportCodeIds?: ICoordinatorReportSupportCodeIds;
-}
-export interface ICoordinatorReportSupportCodeIds {
-    stepDefinitionIds: string[];
-    beforeTestCaseHookDefinitionIds: string[];
-    afterTestCaseHookDefinitionIds: string[];
 }

package/lib/runtime/parallel/command_types.js.map

@@ -1 +1 @@
-{"version":3,"file":"command_types.js","sourceRoot":"","sources":["../../../src/runtime/parallel/command_types.ts"],"names":[],"mappings":"","sourcesContent":["import { messages } from '@cucumber/messages'\nimport { IRuntimeOptions } from '../index'\n\n// Messages from Coordinator to Worker\n\nexport interface IWorkerCommand {\n  initialize?: IWorkerCommandInitialize\n  run?: IWorkerCommandRun\n  finalize?: boolean\n}\n\nexport interface IWorkerCommandInitialize {\n  filterStacktraces: boolean\n  supportCodePaths: string[]\n  supportCodeRequiredModules: string[]\n  options: IRuntimeOptions\n}\n\nexport interface IWorkerCommandRun {\n  retries: number\n  skip: boolean\n  elapsed: number\n  pickle: messages.IPickle\n  gherkinDocument: messages.IGherkinDocument\n}\n\n// Messages from Worker to Coordinator\n\nexport interface ICoordinatorReport {\n  jsonEnvelope?: string\n  ready?: boolean\n  supportCodeIds?: ICoordinatorReportSupportCodeIds\n}\n\nexport interface ICoordinatorReportSupportCodeIds {\n  stepDefinitionIds: string[]\n  beforeTestCaseHookDefinitionIds: string[]\n  afterTestCaseHookDefinitionIds: string[]\n}\n"]}
+{"version":3,"file":"command_types.js","sourceRoot":"","sources":["../../../src/runtime/parallel/command_types.ts"],"names":[],"mappings":"","sourcesContent":["import * as messages from '@cucumber/messages'\nimport { IRuntimeOptions } from '../index'\n\n// Messages from Coordinator to Worker\n\nexport interface IWorkerCommand {\n  initialize?: IWorkerCommandInitialize\n  run?: IWorkerCommandRun\n  finalize?: boolean\n}\n\nexport interface IWorkerCommandInitialize {\n  filterStacktraces: boolean\n  supportCodePaths: string[]\n  supportCodeRequiredModules: string[]\n  supportCodeIds?: ICanonicalSupportCodeIds\n  options: IRuntimeOptions\n}\n\nexport interface ICanonicalSupportCodeIds {\n  stepDefinitionIds: string[]\n  beforeTestCaseHookDefinitionIds: string[]\n  afterTestCaseHookDefinitionIds: string[]\n}\n\nexport interface IWorkerCommandRun {\n  retries: number\n  skip: boolean\n  elapsed: number\n  pickle: messages.Pickle\n  testCase: messages.TestCase\n  gherkinDocument: messages.GherkinDocument\n}\n\n// Messages from Worker to Coordinator\n\nexport interface ICoordinatorReport {\n  jsonEnvelope?: string\n  ready?: boolean\n}\n"]}

package/lib/runtime/parallel/coordinator.d.ts

@@ -1,16 +1,18 @@
 /// <reference types="node" />
 import { ChildProcess } from 'child_process';
-import { messages } from '@cucumber/messages';
+import * as messages from '@cucumber/messages';
 import { EventEmitter } from 'events';
 import { EventDataCollector } from '../../formatter/helpers';
 import { IRuntimeOptions } from '..';
 import { ISupportCodeLibrary } from '../../support_code_library_builder/types';
-import { ICoordinatorReport, ICoordinatorReportSupportCodeIds } from './command_types';
+import { ICoordinatorReport } from './command_types';
+import { IdGenerator } from '@cucumber/messages';
 export interface INewCoordinatorOptions {
     cwd: string;
     eventBroadcaster: EventEmitter;
     eventDataCollector: EventDataCollector;
     options: IRuntimeOptions;
+    newId: IdGenerator.NewId;
     pickleIds: string[];
     supportCodeLibrary: ISupportCodeLibrary;
     supportCodePaths: string[];
@@ -28,22 +30,21 @@ export default class Coordinator {
     private onFinish;
     private nextPickleIdIndex;
     private readonly options;
+    private readonly newId;
     private readonly pickleIds;
+    private assembledTestCases;
     private workers;
-    private supportCodeIdMap;
     private readonly supportCodeLibrary;
     private readonly supportCodePaths;
     private readonly supportCodeRequiredModules;
     private success;
-    constructor({ cwd, eventBroadcaster, eventDataCollector, pickleIds, options, supportCodeLibrary, supportCodePaths, supportCodeRequiredModules, }: INewCoordinatorOptions);
+    constructor({ cwd, eventBroadcaster, eventDataCollector, pickleIds, options, newId, supportCodeLibrary, supportCodePaths, supportCodeRequiredModules, }: INewCoordinatorOptions);
     parseWorkerMessage(worker: IWorker, message: ICoordinatorReport): void;
-    saveDefinitionIdMapping(message: ICoordinatorReportSupportCodeIds): void;
-    remapDefinitionIds(testCase: messages.ITestCase): void;
     startWorker(id: string, total: number): void;
     onWorkerProcessClose(exitCode: number): void;
-    parseTestCaseResult(testCaseFinished: messages.ITestCaseFinished): void;
-    run(numberOfWorkers: number, done: (success: boolean) => void): void;
+    parseTestCaseResult(testCaseFinished: messages.TestCaseFinished): void;
+    run(numberOfWorkers: number): Promise<boolean>;
     giveWork(worker: IWorker): void;
-    shouldCauseFailure(status: messages.TestStepFinished.TestStepResult.Status): boolean;
+    shouldCauseFailure(status: messages.TestStepResultStatus): boolean;
 }
 export {};

package/lib/runtime/parallel/coordinator.js

@@ -1,4 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -6,14 +25,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
-const status_1 = __importDefault(require("../../status"));
 const helpers_1 = require("../helpers");
-const messages_1 = require("@cucumber/messages");
+const messages = __importStar(require("@cucumber/messages"));
 const value_checker_1 = require("../../value_checker");
 const stopwatch_1 = require("../stopwatch");
+const assemble_test_cases_1 = require("../assemble_test_cases");
 const runWorkerPath = path_1.default.resolve(__dirname, 'run_worker.js');
 class Coordinator {
-    constructor({ cwd, eventBroadcaster, eventDataCollector, pickleIds, options, supportCodeLibrary, supportCodePaths, supportCodeRequiredModules, }) {
+    constructor({ cwd, eventBroadcaster, eventDataCollector, pickleIds, options, newId, supportCodeLibrary, supportCodePaths, supportCodeRequiredModules, }) {
         this.cwd = cwd;
         this.eventBroadcaster = eventBroadcaster;
         this.eventDataCollector = eventDataCollector;
@@ -21,6 +40,7 @@ class Coordinator {
             ? new stopwatch_1.PredictableTestRunStopwatch()
             : new stopwatch_1.RealTestRunStopwatch();
         this.options = options;
+        this.newId = newId;
         this.supportCodeLibrary = supportCodeLibrary;
         this.supportCodePaths = supportCodePaths;
         this.supportCodeRequiredModules = supportCodeRequiredModules;
@@ -28,21 +48,14 @@ class Coordinator {
         this.nextPickleIdIndex = 0;
         this.success = true;
         this.workers = {};
-        this.supportCodeIdMap = {};
     }
     parseWorkerMessage(worker, message) {
-        if (value_checker_1.doesHaveValue(message.supportCodeIds)) {
-            this.saveDefinitionIdMapping(message.supportCodeIds);
-        }
-        else if (message.ready) {
+        if (message.ready) {
             this.giveWork(worker);
         }
         else if (value_checker_1.doesHaveValue(message.jsonEnvelope)) {
-            const envelope = messages_1.messages.Envelope.fromObject(JSON.parse(message.jsonEnvelope));
+            const envelope = messages.parseEnvelope(message.jsonEnvelope);
             this.eventBroadcaster.emit('envelope', envelope);
-            if (value_checker_1.doesHaveValue(envelope.testCase)) {
-                this.remapDefinitionIds(envelope.testCase);
-            }
             if (value_checker_1.doesHaveValue(envelope.testCaseFinished)) {
                 this.parseTestCaseResult(envelope.testCaseFinished);
             }
@@ -51,27 +64,6 @@ class Coordinator {
             throw new Error(`Unexpected message from worker: ${JSON.stringify(message)}`);
         }
     }
-    saveDefinitionIdMapping(message) {
-        lodash_1.default.each(message.stepDefinitionIds, (id, index) => {
-            this.supportCodeIdMap[id] = this.supportCodeLibrary.stepDefinitions[index].id;
-        });
-        lodash_1.default.each(message.beforeTestCaseHookDefinitionIds, (id, index) => {
-            this.supportCodeIdMap[id] = this.supportCodeLibrary.beforeTestCaseHookDefinitions[index].id;
-        });
-        lodash_1.default.each(message.afterTestCaseHookDefinitionIds, (id, index) => {
-            this.supportCodeIdMap[id] = this.supportCodeLibrary.afterTestCaseHookDefinitions[index].id;
-        });
-    }
-    remapDefinitionIds(testCase) {
-        for (const testStep of testCase.testSteps) {
-            if (testStep.hookId !== '') {
-                testStep.hookId = this.supportCodeIdMap[testStep.hookId];
-            }
-            if (value_checker_1.doesHaveValue(testStep.stepDefinitionIds)) {
-                testStep.stepDefinitionIds = testStep.stepDefinitionIds.map((id) => this.supportCodeIdMap[id]);
-            }
-        }
-    }
     startWorker(id, total) {
         const workerProcess = child_process_1.fork(runWorkerPath, [], {
             cwd: this.cwd,
@@ -96,21 +88,29 @@ class Coordinator {
                 filterStacktraces: this.options.filterStacktraces,
                 supportCodePaths: this.supportCodePaths,
                 supportCodeRequiredModules: this.supportCodeRequiredModules,
+                supportCodeIds: {
+                    stepDefinitionIds: this.supportCodeLibrary.stepDefinitions.map((s) => s.id),
+                    beforeTestCaseHookDefinitionIds: this.supportCodeLibrary.beforeTestCaseHookDefinitions.map((h) => h.id),
+                    afterTestCaseHookDefinitionIds: this.supportCodeLibrary.afterTestCaseHookDefinitions.map((h) => h.id),
+                },
                 options: this.options,
             },
         };
         worker.process.send(initializeCommand);
     }
     onWorkerProcessClose(exitCode) {
-        if (exitCode !== 0) {
+        const success = exitCode === 0;
+        if (!success) {
             this.success = false;
         }
         if (lodash_1.default.every(this.workers, 'closed')) {
-            this.eventBroadcaster.emit('envelope', messages_1.messages.Envelope.fromObject({
+            const envelope = {
                 testRunFinished: {
                     timestamp: this.stopwatch.timestamp(),
+                    success,
                 },
-            }));
+            };
+            this.eventBroadcaster.emit('envelope', envelope);
             this.onFinish(this.success);
         }
     }
@@ -121,15 +121,24 @@ class Coordinator {
             this.success = false;
         }
     }
-    run(numberOfWorkers, done) {
-        this.eventBroadcaster.emit('envelope', new messages_1.messages.Envelope({
+    async run(numberOfWorkers) {
+        const envelope = {
             testRunStarted: {
                 timestamp: this.stopwatch.timestamp(),
             },
-        }));
+        };
+        this.eventBroadcaster.emit('envelope', envelope);
         this.stopwatch.start();
-        lodash_1.default.times(numberOfWorkers, (id) => this.startWorker(id.toString(), numberOfWorkers));
-        this.onFinish = done;
+        this.assembledTestCases = await assemble_test_cases_1.assembleTestCases({
+            eventBroadcaster: this.eventBroadcaster,
+            newId: this.newId,
+            pickles: this.pickleIds.map((pickleId) => this.eventDataCollector.getPickle(pickleId)),
+            supportCodeLibrary: this.supportCodeLibrary,
+        });
+        return await new Promise((resolve) => {
+            lodash_1.default.times(numberOfWorkers, (id) => this.startWorker(id.toString(), numberOfWorkers));
+            this.onFinish = resolve;
+        });
     }
     giveWork(worker) {
         if (this.nextPickleIdIndex === this.pickleIds.length) {
@@ -140,6 +149,7 @@ class Coordinator {
         const pickleId = this.pickleIds[this.nextPickleIdIndex];
         this.nextPickleIdIndex += 1;
         const pickle = this.eventDataCollector.getPickle(pickleId);
+        const testCase = this.assembledTestCases[pickleId];
         const gherkinDocument = this.eventDataCollector.getGherkinDocument(pickle.uri);
         const retries = helpers_1.retriesForPickle(pickle, this.options);
         const skip = this.options.dryRun || (this.options.failFast && !this.success);
@@ -149,14 +159,15 @@ class Coordinator {
                 skip,
                 elapsed: this.stopwatch.duration().nanos(),
                 pickle,
+                testCase,
                 gherkinDocument,
             },
         };
         worker.process.send(runCommand);
     }
     shouldCauseFailure(status) {
-        return (lodash_1.default.includes([status_1.default.AMBIGUOUS, status_1.default.FAILED, status_1.default.UNDEFINED], status) ||
-            (status === status_1.default.PENDING && this.options.strict));
+        return (lodash_1.default.includes(['AMBIGUOUS', 'FAILED', 'UNDEFINED'], status) ||
+            (status === 'PENDING' && this.options.strict));
     }
 }
 exports.default = Coordinator;