Skip to content

Commit bd5ea43

Browse files
davidjgossdavidjgoss
authored
refresh cucumber core dependencies (cucumber#1637)
* bump existing cucumber dependencies * add gherkin streams * import gherkinstreams from own package * fix the other streams imports * update create-meta * tell renovate to update monorepo packages together * add scenario to prove tagged rules work * add changelog entry for tagged rules * bring in fixed version of query * bump libs again * updte html-formatter
1 parent b499e64 commit bd5ea43

File tree

8 files changed

+103
-56
lines changed

8 files changed

+103
-56
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CO
1212
### Added
1313

1414
- Support attachments that are already base64-encoded via a prefix on the MIME type e.g. `this.attach(base64String, 'base64:image/png')` ([#1552](https://github.com/cucumber/cucumber-js/pull/1552))
15+
- Support tagged rules (see <https://github.com/cucumber/cucumber/issues/1123>)
1516

1617
### Changed
1718

‎features/rule.feature

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,3 +135,31 @@ Feature: Rule keyword
135135
8 steps (1 failed, 1 skipped, 6 passed)
136136
<duration-stat>
137137
"""
138+
139+
Scenario: Tags on Rules are honoured
140+
Given a file named "features/highlander.feature" with:
141+
"""
142+
Feature: a feature
143+
144+
@mytag
145+
Rule: a rule
146+
147+
Example: a scenario
148+
Given a step
149+
"""
150+
And a file named "features/step_definitions/cucumber_steps.js" with:
151+
"""
152+
const {Given} = require('@cucumber/cucumber')
153+
154+
Given('a step', function() {})
155+
"""
156+
When I run cucumber-js with arguments `--tags @mytag` and env ``
157+
Then it passes
158+
And it outputs the text:
159+
"""
160+
.
161+
162+
1 scenario (1 passed)
163+
1 step (1 passed)
164+
<duration-stat>
165+
"""

‎package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,13 @@
168168
"node": ">=10"
169169
},
170170
"dependencies": {
171-
"@cucumber/create-meta": "3.0.0",
172-
"@cucumber/cucumber-expressions": "12.0.0",
173-
"@cucumber/gherkin": "17.0.2",
174-
"@cucumber/html-formatter": "12.0.0",
175-
"@cucumber/messages": "14.0.1",
176-
"@cucumber/query": "8.0.0",
171+
"@cucumber/create-meta": "4.0.0",
172+
"@cucumber/cucumber-expressions": "12.0.1",
173+
"@cucumber/gherkin": "18.0.0",
174+
"@cucumber/gherkin-streams": "1.0.0",
175+
"@cucumber/html-formatter": "13.0.0",
176+
"@cucumber/messages": "15.0.0",
177+
"@cucumber/query": "9.0.2",
177178
"@cucumber/tag-expressions": "3.0.1",
178179
"assertion-error-formatter": "3.0.0",
179180
"bluebird": "^3.7.2",
@@ -203,7 +204,7 @@
203204
"verror": "^1.10.0"
204205
},
205206
"devDependencies": {
206-
"@cucumber/compatibility-kit": "3.0.0",
207+
"@cucumber/compatibility-kit": "4.0.1",
207208
"@sinonjs/fake-timers": "7.0.2",
208209
"@types/bluebird": "3.5.33",
209210
"@types/chai": "4.2.15",

‎renovate.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
{
1515
"packagePatterns": ["mocha", "chai", "sinon"],
1616
"groupName": "unit test packages"
17+
},
18+
{
19+
"packagePatterns": ["@cucumber"],
20+
"groupName": "cucumber packages"
1721
}
1822
],
1923
"schedule": [

‎src/cli/helpers_spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { EventEmitter } from 'events'
99
import PickleFilter from '../pickle_filter'
1010
import { messages, IdGenerator } from '@cucumber/messages'
1111
import { EventDataCollector } from '../formatter/helpers'
12-
import GherkinStreams from '@cucumber/gherkin/dist/src/stream/GherkinStreams'
12+
import { GherkinStreams } from '@cucumber/gherkin-streams'
1313
import { Readable } from 'stream'
1414
import StepDefinition from '../models/step_definition'
1515
import {

‎src/cli/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { IdGenerator } from '@cucumber/messages'
2424
import { IFormatterStream } from '../formatter'
2525
import { WriteStream as TtyWriteStream } from 'tty'
2626
import { doesNotHaveValue } from '../value_checker'
27-
import GherkinStreams from '@cucumber/gherkin/dist/src/stream/GherkinStreams'
27+
import { GherkinStreams } from '@cucumber/gherkin-streams'
2828
import { ISupportCodeLibrary } from '../support_code_library_builder/types'
2929
import { IParsedArgvFormatOptions } from './argv_parser'
3030
import HttpStream from '../formatter/http_stream'

‎test/gherkin_helpers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { messages } from '@cucumber/messages'
22
import { doesHaveValue } from '../src/value_checker'
33
import { IGherkinOptions } from '@cucumber/gherkin'
4-
import GherkinStreams from '@cucumber/gherkin/dist/src/stream/GherkinStreams'
4+
import { GherkinStreams } from '@cucumber/gherkin-streams'
55
import { EventEmitter } from 'events'
66

77
export interface IParsedSource {

‎yarn.lock

Lines changed: 59 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -191,59 +191,77 @@
191191
lodash "^4.17.19"
192192
to-fast-properties "^2.0.0"
193193

194-
"@cucumber/compatibility-kit@3.0.0":
195-
version "3.0.0"
196-
resolved "https://registry.yarnpkg.com/@cucumber/compatibility-kit/-/compatibility-kit-3.0.0.tgz#adc7521d188e550806ee3a8fddd51dc392989e83"
197-
integrity sha512-WEwQv58ZKXw6rtYqTN9b0+vIIGb1c/fkw8H6lm/z+gO/x1WuqKMJkbMc1iImuQJ7NwsnXfiuvTGl/Fn5N0mnjQ==
194+
"@cucumber/compatibility-kit@4.0.1":
195+
version "4.0.1"
196+
resolved "https://registry.yarnpkg.com/@cucumber/compatibility-kit/-/compatibility-kit-4.0.1.tgz#566f95f2b1ca9f9b8c10ef463e9558ee03a393a4"
197+
integrity sha512-M6UPb4wnrk8Ue2tb0rH89kddFPO0Ccsp7Gkz1ruytQaFvIWqnlyjpadY3YdXjH3bkIisbGXK+djSh3PfwRZ8ew==
198198

199-
"@cucumber/create-meta@3.0.0":
200-
version "3.0.0"
201-
resolved "https://registry.yarnpkg.com/@cucumber/create-meta/-/create-meta-3.0.0.tgz#febc8933eea23cd1ffe2dfb3345708d0db27fb82"
202-
integrity sha512-DFi+mILvIOQL71Itel1A7EliUTbu7jZ/i7Zqa8cziuf7YrLi0xz8Afb5VxZ6YOBzRzVg/T6N3K/wytRkMToAeA==
199+
"@cucumber/create-meta@4.0.0":
200+
version "4.0.0"
201+
resolved "https://registry.yarnpkg.com/@cucumber/create-meta/-/create-meta-4.0.0.tgz#ef97070640475e6e1480be93dc1042d361516ea6"
202+
integrity sha512-I2GWC9PoIGmpc0w/vz2YYeGl/eog1oFogYKUjgflDjhECo1mpD/WQjMRPNOsZnd859S8fPgVByKzGQAWjfjGyQ==
203203
dependencies:
204-
"@cucumber/messages" "^14.0.1"
205-
ts-node "^9.1.1"
206-
typescript "^4.1.3"
204+
"@cucumber/messages" "^15.0.0"
207205

208-
"@cucumber/[email protected].0":
209-
version "12.0.0"
210-
resolved "https://registry.yarnpkg.com/@cucumber/cucumber-expressions/-/cucumber-expressions-12.0.0.tgz#f63a576b828b99ffed6133e6c3b0deaf138eb00e"
211-
integrity sha512-FxegCKKW2w1k9OS1Lpt3IhUrLmVKYjroQY8DiRd2e/r0Ygal6WCpljgMiRSh56P2hYkAtrkgFHgDwleNAYjs1Q==
206+
"@cucumber/[email protected].1":
207+
version "12.0.1"
208+
resolved "https://registry.yarnpkg.com/@cucumber/cucumber-expressions/-/cucumber-expressions-12.0.1.tgz#7ab8936adb82d2bb45b86baa494e4e6e3dc9839f"
209+
integrity sha512-ANzu80Mw9GzTQ5ImuLdBtHnQfG8MghVvvtud4GHBvlQ4Wzu1SvkUj3RsdtW9w3p7mATSw8SiSFj6Jel3cEWN6Q==
212210
dependencies:
213211
becke-ch--regex--s0-0-v1--base--pl--lib "^1.4.0"
214212

215-
"@cucumber/gherkin@17.0.2":
216-
version "17.0.2"
217-
resolved "https://registry.yarnpkg.com/@cucumber/gherkin/-/gherkin-17.0.2.tgz#c6644ecb5c2c4671360d9e5affa2a00e7897ab78"
218-
integrity sha512-U8ZxbYVLEXqUy4Fx9BJ5ncIzXz/eVg+fKV2F8B1t5f6eDMgPQ2Aq3M8gy3yE422OAuJ+RFRuezNtuEbpmf2r4g==
213+
"@cucumber/gherkin-streams@1.0.0":
214+
version "1.0.0"
215+
resolved "https://registry.yarnpkg.com/@cucumber/gherkin-streams/-/gherkin-streams-1.0.0.tgz#e4938ba130fceec8ebc641298557c2a21dcabd5f"
216+
integrity sha512-ZGUvkwj8DnMozii+8YqWtiWuKqU+Opt50dWVeJzv2e+4GDh0P1Nc04RGMZkFf8WTl2sgBJq5waPUKCQVPaw6iQ==
219217
dependencies:
220-
"@cucumber/messages" "^14.0.1"
221-
commander "^7.1.0"
218+
"@cucumber/gherkin" "^18.0.0"
219+
"@cucumber/message-streams" "^1.0.0"
220+
"@cucumber/messages" "^15.0.0"
221+
commander "^7.2.0"
222+
protobufjs "^6.10.2"
222223
source-map-support "^0.5.19"
223224

224-
"@cucumber/html-formatter@12.0.0":
225-
version "12.0.0"
226-
resolved "https://registry.yarnpkg.com/@cucumber/html-formatter/-/html-formatter-12.0.0.tgz#a5a0bab1ddc1a391043083fbab1683b520ba8c39"
227-
integrity sha512-OdENyDmYiNUQ/+gRPfTGJB6L9KAKx+f9KRyt56FkQaPQCaJKi3KI5PB3SIp1GAP4juha85xq6cF6hPTx9eXPgg==
225+
"@cucumber/[email protected]", "@cucumber/gherkin@^18.0.0":
226+
version "18.0.0"
227+
resolved "https://registry.yarnpkg.com/@cucumber/gherkin/-/gherkin-18.0.0.tgz#af51ca7173aa7818ed1aa50e3477d9bbe9d1c954"
228+
integrity sha512-Az+VD2NyOM2ZjzuVGrpJTl1VDv1j50graLtjUp7GfGYN+wMMV+jPgKV5fGYQeocjDnJYYlKymiUZzxcxvStJmg==
228229
dependencies:
229-
"@cucumber/messages" "^14.0.1"
230-
commander "^7.0.0"
230+
"@cucumber/message-streams" "^1.0.0"
231+
"@cucumber/messages" "^15.0.0"
231232

232-
"@cucumber/[email protected]", "@cucumber/messages@^14.0.0", "@cucumber/messages@^14.0.1":
233-
version "14.0.1"
234-
resolved "https://registry.yarnpkg.com/@cucumber/messages/-/messages-14.0.1.tgz#cb2abaa64bd9b4a3ddf0913ff17cafe5b901051c"
235-
integrity sha512-uCD/yP7P5em0KP1r59x6JayAxH7n8QXU9FbC3H8XMosZuM9z4PVLeU5pdJRkkCLFXqjpAZ3LJw65hlYDrBujEQ==
233+
"@cucumber/[email protected]":
234+
version "13.0.0"
235+
resolved "https://registry.yarnpkg.com/@cucumber/html-formatter/-/html-formatter-13.0.0.tgz#ac6abe30813e455efe5e19e01daa00cf2d9fe32b"
236+
integrity sha512-+gNLbgeti/5UXm2bVYvtjgdlEiY6r1WsNWChezXE6LJsviy7HrA6WWbwFWFSxs3CLgee5Us5Pe8JonQAnFEiBw==
237+
dependencies:
238+
"@cucumber/messages" "^15.0.0"
239+
commander "^7.2.0"
240+
source-map-support "^0.5.19"
241+
242+
"@cucumber/message-streams@^1.0.0":
243+
version "1.0.0"
244+
resolved "https://registry.yarnpkg.com/@cucumber/message-streams/-/message-streams-1.0.0.tgz#5162e65df51eb51e0aa484ef0ed46200b19a699a"
245+
integrity sha512-i1Jx0EDnE+3Na82UxJ2VqE6aWWJJ+1H+3ax+SYgHmCmlUDJiJzx9dHxAAO3GISrM/RYUAuqMGHNAMnIcxkL3Pw==
246+
dependencies:
247+
"@cucumber/messages" "^15.0.0"
248+
protobufjs "^6.10.2"
249+
250+
"@cucumber/[email protected]", "@cucumber/messages@^15.0.0":
251+
version "15.0.0"
252+
resolved "https://registry.yarnpkg.com/@cucumber/messages/-/messages-15.0.0.tgz#58e6541a6c21c4f0d3d4a82c24bbbfe72a6ff94c"
253+
integrity sha512-LtxzSCRmYZTAKO6ucAcMflz0u90l2fev539OG+EioJ26F14KmmtxZwGabfjTxLf8NgyKeWsO8TGI2G3z4Kjr+A==
236254
dependencies:
237255
"@types/uuid" "^8.3.0"
238256
protobufjs "^6.10.2"
239257
uuid "^8.3.2"
240258

241-
"@cucumber/query@8.0.0":
242-
version "8.0.0"
243-
resolved "https://registry.yarnpkg.com/@cucumber/query/-/query-8.0.0.tgz#58e2bf98a2025a2bb3fa79ae56d27496c092eb5e"
244-
integrity sha512-dCe3OiurIQZa1rppq/g0kweT6y0c6+XxtsCuNvL0qvqICYz9ZyoXX9wKOMt0s6HD9mNVLm00XI078sHPqgylUw==
259+
"@cucumber/query@9.0.2":
260+
version "9.0.2"
261+
resolved "https://registry.yarnpkg.com/@cucumber/query/-/query-9.0.2.tgz#2b7ef65df4bba58f14d9415b5eb167fde10e670e"
262+
integrity sha512-YrOSZQzWWVle+8B57zaSFfQt9jYTPDamBnwdc1EGKI1sXyALjHnGgCLXUFH/HjDieQkXIh2y+MHJ51t2u9ys1A==
245263
dependencies:
246-
"@cucumber/messages" "^14.0.0"
264+
"@cucumber/messages" "^15.0.0"
247265
"@teppeis/multimaps" "^2.0.0"
248266

249267
"@cucumber/[email protected]":
@@ -1270,10 +1288,10 @@ commander@^7.0.0:
12701288
resolved "https://registry.yarnpkg.com/commander/-/commander-7.0.0.tgz#3e2bbfd8bb6724760980988fb5b22b7ee6b71ab2"
12711289
integrity sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA==
12721290

1273-
commander@^7.1.0:
1274-
version "7.1.0"
1275-
resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff"
1276-
integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==
1291+
commander@^7.2.0:
1292+
version "7.2.0"
1293+
resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
1294+
integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
12771295

12781296
commondir@^1.0.1:
12791297
version "1.0.1"
@@ -4210,7 +4228,7 @@ trim-newlines@^3.0.0:
42104228
resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30"
42114229
integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==
42124230

4213-
[email protected], ts-node@^9.1.1:
4231+
[email protected]:
42144232
version "9.1.1"
42154233
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d"
42164234
integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==
@@ -4328,11 +4346,6 @@ [email protected]:
43284346
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3"
43294347
integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==
43304348

4331-
typescript@^4.1.3:
4332-
version "4.1.3"
4333-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
4334-
integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
4335-
43364349
unique-string@^2.0.0:
43374350
version "2.0.0"
43384351
resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"

0 commit comments

Comments
 (0)