Skip to content

Commit

Permalink
chore: use new ci-environment package instead of create-meta (#1868)
Browse files Browse the repository at this point in the history
* install lib

* WIP

* bump other cucumber deps

* finish impl

* add changelog

* redundant comment

* update library, simplify mapping

* simplify again

* update changelog
  • Loading branch information
davidjgoss authored Dec 15, 2021
1 parent 1181ae6 commit 30be70f
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 33 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CONTRIBUTING.md) on how to contribute to Cucumber.

## [Unreleased]
### Changed
- Switched to new `@cucumber/ci-environment` library for CI detection ([#1868](https://github.com/cucumber/cucumber-js/pull/1868))

### Fixed
- Handles spaces in paths for developers working on cucumbers's own code ([#1845](https://github.com/cucumber/cucumber-js/issues/1845))
- Ensure package.json can be imported by consuming projects
Expand Down
40 changes: 17 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,13 @@
},
"dependencies": {
"@cspotcode/source-map-support": "^0.7.0",
"@cucumber/create-meta": "6.0.4",
"@cucumber/cucumber-expressions": "^14.0.0",
"@cucumber/gherkin": "^22.0.0",
"@cucumber/gherkin-streams": "^4.0.0",
"@cucumber/html-formatter": "^17.0.0",
"@cucumber/messages": "^17.1.1",
"@cucumber/tag-expressions": "^4.1.0",
"@cucumber/ci-environment": "8.0.0",
"@cucumber/cucumber-expressions": "14.0.0",
"@cucumber/gherkin": "22.0.0",
"@cucumber/gherkin-streams": "4.0.0",
"@cucumber/html-formatter": "17.0.0",
"@cucumber/messages": "17.1.1",
"@cucumber/tag-expressions": "4.1.0",
"assertion-error-formatter": "^3.0.0",
"capital-case": "^1.0.4",
"cli-table3": "^0.6.0",
Expand Down
26 changes: 23 additions & 3 deletions src/cli/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ import { EventDataCollector } from '../formatter/helpers'
import { doesHaveValue } from '../value_checker'
import OptionSplitter from './option_splitter'
import { Readable } from 'stream'
import { IdGenerator } from '@cucumber/messages'
import os from 'os'
import * as messages from '@cucumber/messages'
import createMeta from '@cucumber/create-meta'
import { IdGenerator } from '@cucumber/messages'
import detectCiEnvironment from '@cucumber/ci-environment'
import { ISupportCodeLibrary } from '../support_code_library_builder/types'
import TestCaseHookDefinition from '../models/test_case_hook_definition'
import TestRunHookDefinition from '../models/test_run_hook_definition'
Expand Down Expand Up @@ -118,8 +119,27 @@ export async function emitMetaMessage(
eventBroadcaster: EventEmitter,
env: NodeJS.ProcessEnv
): Promise<void> {
const meta: messages.Meta = {
protocolVersion: messages.version,
implementation: {
version,
name: 'cucumber-js',
},
cpu: {
name: os.arch(),
},
os: {
name: os.platform(),
version: os.release(),
},
runtime: {
name: 'node.js',
version: process.versions.node,
},
ci: detectCiEnvironment(env),
}
eventBroadcaster.emit('envelope', {
meta: createMeta('cucumber-js', version, env),
meta,
})
}

Expand Down

0 comments on commit 30be70f

Please sign in to comment.