Merge branch 'main' into update-migration-links-to-jsonschemas

features/fixtures/formatters/passed-rule.message.json.ts

@@ -2,8 +2,7 @@ module.exports = [
  {
  source: {
  uri: 'features/a.feature',
- data:
- 'Feature: a feature\n Rule: a rule\n Example: an example\n Given a step',
+ data: 'Feature: a feature\n Rule: a rule\n Example: an example\n Given a step',
  mediaType: 'text/x.cucumber.gherkin+plain',
  },
  },

package.json

@@ -226,17 +226,17 @@
  "@types/stream-buffers": "3.0.3",
  "@types/tmp": "0.2.0",
  "@types/verror": "1.10.4",
- "@typescript-eslint/eslint-plugin": "4.22.0",
- "@typescript-eslint/parser": "4.22.0",
+ "@typescript-eslint/eslint-plugin": "4.26.0",
+ "@typescript-eslint/parser": "4.26.0",
  "chai": "4.3.4",
  "chai-exclude": "2.0.3",
  "coffeescript": "2.5.1",
  "dependency-lint": "6.0.0",
  "dirty-chai": "2.0.1",
- "eslint": "7.25.0",
+ "eslint": "7.27.0",
  "eslint-config-prettier": "8.3.0",
  "eslint-config-standard-with-typescript": "20.0.0",
- "eslint-plugin-import": "2.22.1",
+ "eslint-plugin-import": "2.23.4",
  "eslint-plugin-node": "11.1.0",
  "eslint-plugin-prettier": "3.4.0",
  "eslint-plugin-promise": "5.1.0",
@@ -246,7 +246,7 @@
  "mocha": "8.4.0",
  "mustache": "4.2.0",
  "nyc": "15.1.0",
- "prettier": "2.2.1",
+ "prettier": "2.3.0",
  "semver": "7.3.5",
  "sinon": "11.1.1",
  "sinon-chai": "3.7.0",

src/cli/configuration_builder_spec.ts

@@ -76,11 +76,8 @@ describe('Configuration', () => {
  const argv = baseArgv.concat([relativeFeaturePath])
 
  // Act
- const {
- featurePaths,
- pickleFilterOptions,
- supportCodePaths,
- } = await ConfigurationBuilder.build({ argv, cwd })
+ const { featurePaths, pickleFilterOptions, supportCodePaths } =
+ await ConfigurationBuilder.build({ argv, cwd })
 
  // Assert
  expect(featurePaths).to.eql([featurePath])
@@ -99,11 +96,8 @@ describe('Configuration', () => {
  const argv = baseArgv.concat([relativeFeaturePath])
 
  // Act
- const {
- featurePaths,
- pickleFilterOptions,
- supportCodePaths,
- } = await ConfigurationBuilder.build({ argv, cwd })
+ const { featurePaths, pickleFilterOptions, supportCodePaths } =
+ await ConfigurationBuilder.build({ argv, cwd })
 
  // Assert
  expect(featurePaths).to.eql([featurePath])
@@ -124,11 +118,8 @@ describe('Configuration', () => {
  const argv = baseArgv.concat([relativeFeaturePath])
 
  // Act
- const {
- featurePaths,
- pickleFilterOptions,
- supportCodePaths,
- } = await ConfigurationBuilder.build({ argv, cwd })
+ const { featurePaths, pickleFilterOptions, supportCodePaths } =
+ await ConfigurationBuilder.build({ argv, cwd })
 
  // Assert
  expect(featurePaths).to.eql([featurePath])
@@ -151,11 +142,8 @@ describe('Configuration', () => {
  const argv = baseArgv.concat([relativeFeaturePath])
 
  // Act
- const {
- featurePaths,
- pickleFilterOptions,
- supportCodePaths,
- } = await ConfigurationBuilder.build({ argv, cwd })
+ const { featurePaths, pickleFilterOptions, supportCodePaths } =
+ await ConfigurationBuilder.build({ argv, cwd })
 
  // Assert
  expect(featurePaths).to.eql([featurePath])
@@ -175,11 +163,8 @@ describe('Configuration', () => {
  const argv = baseArgv.concat([relativeRerunPath])
 
  // Act
- const {
- featurePaths,
- pickleFilterOptions,
- supportCodePaths,
- } = await ConfigurationBuilder.build({ argv, cwd })
+ const { featurePaths, pickleFilterOptions, supportCodePaths } =
+ await ConfigurationBuilder.build({ argv, cwd })
 
  // Assert
  expect(featurePaths).to.eql([])
@@ -199,11 +184,8 @@ describe('Configuration', () => {
  const argv = baseArgv.concat([relativeRerunPath])
 
  // Act
- const {
- featurePaths,
- pickleFilterOptions,
- supportCodePaths,
- } = await ConfigurationBuilder.build({ argv, cwd })
+ const { featurePaths, pickleFilterOptions, supportCodePaths } =
+ await ConfigurationBuilder.build({ argv, cwd })
 
  // Assert
  expect(featurePaths).to.eql([])
@@ -223,11 +205,8 @@ describe('Configuration', () => {
  const argv = baseArgv.concat([relativeRerunPath])
 
  // Act
- const {
- featurePaths,
- pickleFilterOptions,
- supportCodePaths,
- } = await ConfigurationBuilder.build({ argv, cwd })
+ const { featurePaths, pickleFilterOptions, supportCodePaths } =
+ await ConfigurationBuilder.build({ argv, cwd })
 
  // Assert
  expect(featurePaths).to.eql([])

src/cli/index.ts

@@ -133,7 +133,9 @@ export default class Cli {
  supportCodeLibrary,
  }
  if (doesNotHaveValue(formatOptions.colorsEnabled)) {
- typeOptions.parsedArgvOptions.colorsEnabled = (stream as TtyWriteStream).isTTY
+ typeOptions.parsedArgvOptions.colorsEnabled = (
+ stream as TtyWriteStream
+ ).isTTY
  }
  if (type === 'progress-bar' && !(stream as TtyWriteStream).isTTY) {
  const outputToName = outputTo === '' ? 'stdout' : outputTo

src/formatter/helpers/event_data_collector.ts

@@ -113,17 +113,15 @@ export default class EventDataCollector {
  testStepId,
  testStepResult,
  }: messages.TestStepFinished): void {
- this.testCaseAttemptDataMap[testCaseStartedId].stepResults[
- testStepId
- ] = testStepResult
+ this.testCaseAttemptDataMap[testCaseStartedId].stepResults[testStepId] =
+ testStepResult
  }
 
  storeTestCaseResult({ testCaseStartedId }: messages.TestCaseFinished): void {
  const stepResults = values(
  this.testCaseAttemptDataMap[testCaseStartedId].stepResults
  )
- this.testCaseAttemptDataMap[
- testCaseStartedId
- ].worstTestStepResult = messages.getWorstTestStepResult(stepResults)
+ this.testCaseAttemptDataMap[testCaseStartedId].worstTestStepResult =
+ messages.getWorstTestStepResult(stepResults)
  }
 }

src/formatter/helpers/gherkin_document_parser.ts

@@ -68,9 +68,8 @@ export function getGherkinScenarioLocationMap(
  gherkinDocument: messages.GherkinDocument
 ): Record<string, messages.Location> {
  const locationMap: Record<string, messages.Location> = {}
- const scenarioMap: Record<string, messages.Scenario> = getGherkinScenarioMap(
- gherkinDocument
- )
+ const scenarioMap: Record<string, messages.Scenario> =
+ getGherkinScenarioMap(gherkinDocument)
  _.entries<messages.Scenario>(scenarioMap).forEach(([id, scenario]) => {
  locationMap[id] = scenario.location
  if (doesHaveValue(scenario.examples)) {

src/formatter/helpers/gherkin_document_parser_spec.ts

@@ -78,7 +78,8 @@ describe('GherkinDocumentParser', () => {
 
  it('works for a Background and Rule with its own Background and Examples', async () => {
  // Arrange
- const gherkinDocument = await withBackgroundAndRuleWithBackgroundAndExamples()
+ const gherkinDocument =
+ await withBackgroundAndRuleWithBackgroundAndExamples()
 
  // Act
  const output = getGherkinStepMap(gherkinDocument)
@@ -156,7 +157,8 @@ describe('GherkinDocumentParser', () => {
 
  it('works for a Background and Rule with its own Background and Examples', async () => {
  // Arrange
- const gherkinDocument = await withBackgroundAndRuleWithBackgroundAndExamples()
+ const gherkinDocument =
+ await withBackgroundAndRuleWithBackgroundAndExamples()
 
  // Act
  const output = getGherkinScenarioMap(gherkinDocument)
@@ -215,7 +217,8 @@ describe('GherkinDocumentParser', () => {
 
  it('works for a Background and Rule with its own Background and Examples', async () => {
  // Arrange
- const gherkinDocument = await withBackgroundAndRuleWithBackgroundAndExamples()
+ const gherkinDocument =
+ await withBackgroundAndRuleWithBackgroundAndExamples()
 
  // Act
  const output = await getGherkinExampleRuleMap(gherkinDocument)
@@ -284,7 +287,8 @@ describe('GherkinDocumentParser', () => {
 
  it('works for a Background and Rule with its own Background and Examples', async () => {
  // Arrange
- const gherkinDocument = await withBackgroundAndRuleWithBackgroundAndExamples()
+ const gherkinDocument =
+ await withBackgroundAndRuleWithBackgroundAndExamples()
 
  // Act
  const output = await getGherkinScenarioLocationMap(gherkinDocument)

src/formatter/helpers/pickle_parser.ts

@@ -52,8 +52,7 @@ export function getPickleLocation({
  gherkinDocument,
  pickle,
 }: IGetPickleLocationRequest): messages.Location {
- const gherkinScenarioLocationMap = getGherkinScenarioLocationMap(
- gherkinDocument
- )
+ const gherkinScenarioLocationMap =
+ getGherkinScenarioLocationMap(gherkinDocument)
  return gherkinScenarioLocationMap[_.last(pickle.astNodeIds)]
 }

src/formatter/helpers/test_case_attempt_parser.ts

@@ -133,9 +133,8 @@ export function parseTestCaseAttempt({
 }: IParseTestCaseAttemptRequest): IParsedTestCaseAttempt {
  const { testCase, pickle, gherkinDocument } = testCaseAttempt
  const gherkinStepMap = getGherkinStepMap(gherkinDocument)
- const gherkinScenarioLocationMap = getGherkinScenarioLocationMap(
- gherkinDocument
- )
+ const gherkinScenarioLocationMap =
+ getGherkinScenarioLocationMap(gherkinDocument)
  const pickleStepMap = getPickleStepMap(pickle)
  const relativePickleUri = pickle.uri
  const parsedTestCase: IParsedTestCase = {

src/formatter/helpers/usage_helpers/index_spec.ts

@@ -16,9 +16,8 @@ describe('Usage Helpers', () => {
  const supportCodeLibrary = buildSupportCodeLibrary(({ Given }) => {
  Given('a step', code)
  })
- const {
- eventDataCollector,
- } = await getEnvelopesAndEventDataCollector({ supportCodeLibrary })
+ const { eventDataCollector } =
+ await getEnvelopesAndEventDataCollector({ supportCodeLibrary })
 
  // Act
  const output = getUsage({
@@ -53,9 +52,8 @@ describe('Usage Helpers', () => {
  )
  }
  )
- const {
- eventDataCollector,
- } = await getEnvelopesAndEventDataCollector({ supportCodeLibrary })
+ const { eventDataCollector } =
+ await getEnvelopesAndEventDataCollector({ supportCodeLibrary })
 
  // Act
  const output = getUsage({

src/formatter/json_formatter.ts

@@ -12,11 +12,8 @@ import { parseStepArgument } from '../step_arguments'
 
 const { getGherkinStepMap, getGherkinScenarioMap } = GherkinDocumentParser
 
-const {
- getScenarioDescription,
- getPickleStepMap,
- getStepKeyword,
-} = PickleParser
+const { getScenarioDescription, getPickleStepMap, getStepKeyword } =
+ PickleParser
 
 export interface IJsonFeature {
  description: string
@@ -148,9 +145,8 @@ export default class JsonFormatter extends Formatter {
  const gherkinStepMap = getGherkinStepMap(gherkinDocument)
  const gherkinScenarioMap = getGherkinScenarioMap(gherkinDocument)
  const gherkinExampleRuleMap = getGherkinExampleRuleMap(gherkinDocument)
- const gherkinScenarioLocationMap = getGherkinScenarioLocationMap(
- gherkinDocument
- )
+ const gherkinScenarioLocationMap =
+ getGherkinScenarioLocationMap(gherkinDocument)
  const elements = group.map((testCaseAttempt: ITestCaseAttempt) => {
  const { pickle } = testCaseAttempt
  const pickleStepMap = getPickleStepMap(pickle)

src/formatter/json_formatter_spec.ts

@@ -321,8 +321,8 @@ describe('JsonFormatter', () => {
  })
 
  // Assert
- const stepArguments = JSON.parse(output)[0].elements[0].steps[0]
- .arguments
+ const stepArguments =
+ JSON.parse(output)[0].elements[0].steps[0].arguments
  expect(stepArguments).to.eql([
  {
  content: 'This is a DocString',
@@ -359,8 +359,8 @@ describe('JsonFormatter', () => {
  })
 
  // Assert
- const stepArguments = JSON.parse(output)[0].elements[0].steps[0]
- .arguments
+ const stepArguments =
+ JSON.parse(output)[0].elements[0].steps[0].arguments
  expect(stepArguments).to.eql([
  {
  rows: [

src/formatter/progress_bar_formatter.ts

@@ -43,9 +43,8 @@ export default class ProgressBarFormatter extends Formatter {
  testStepId,
  testCaseStartedId,
  }: messages.TestStepFinished): void {
- const { testCase } = this.eventDataCollector.getTestCaseAttempt(
- testCaseStartedId
- )
+ const { testCase } =
+ this.eventDataCollector.getTestCaseAttempt(testCaseStartedId)
  const testStep = testCase.testSteps.find((s) => s.id === testStepId)
  if (doesHaveValue(testStep.pickleStepId)) {
  this.progressBar.tick()

src/formatter/progress_bar_formatter_spec.ts

@@ -101,8 +101,7 @@ describe('ProgressBarFormatter', () => {
  uri: 'a.feature',
  },
  {
- data:
- 'Feature: a\nScenario: b\nGiven a step\nWhen a step\nThen a step',
+ data: 'Feature: a\nScenario: b\nGiven a step\nWhen a step\nThen a step',
  uri: 'b.feature',
  },
  ]
@@ -125,8 +124,7 @@ describe('ProgressBarFormatter', () => {
  uri: 'a.feature',
  },
  {
- data:
- 'Feature: a\nRule: b\nExample: c\nGiven a step\nWhen a step\nThen a step',
+ data: 'Feature: a\nRule: b\nExample: c\nGiven a step\nWhen a step\nThen a step',
  uri: 'b.feature',
  },
  ]
@@ -149,8 +147,7 @@ describe('ProgressBarFormatter', () => {
  uri: 'a.feature',
  },
  {
- data:
- 'Feature: a\nScenario: b\nGiven a step\nWhen a step\nThen a step',
+ data: 'Feature: a\nScenario: b\nGiven a step\nWhen a step\nThen a step',
  uri: 'b.feature',
  },
  ]
@@ -370,8 +367,7 @@ describe('ProgressBarFormatter', () => {
  // Arrange
  const sources = [
  {
- data:
- 'Feature: a\nScenario: b\nGiven a passing step\n When a flaky step\nThen a passing step',
+ data: 'Feature: a\nScenario: b\nGiven a passing step\n When a flaky step\nThen a passing step',
  uri: 'a.feature',
  },
  ]
@@ -384,7 +380,8 @@ describe('ProgressBarFormatter', () => {
  sources,
  supportCodeLibrary,
  })
- const progressBar = progressBarFormatter.progressBar as sinon.SinonStubbedInstance<ProgressBar>
+ const progressBar =
+ progressBarFormatter.progressBar as sinon.SinonStubbedInstance<ProgressBar>
 
  // Assert
  expect(progressBar.interrupt).to.have.callCount(1)