Resolve conflicts #5
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…cucumber#1645) * Start refactoring the code to use the new messages from the json-schema branch. To use those messages, first `npm link` every @cucumber/* module we depend on in the monorepo. Then, `npm link [all the modules]` from this repo. * Everything compiles * Fix import of messages module * Fix import of messages in coordinator * Update predictableTimestamp to work with new messages * Fix tests related to capture groups * Fix some more tests * Fix another spec * All unit tests passing * cck fixes * Make more scenarios pass * Fix import * Export Status * All features passing * npm test is now passing * Update @cucumber dependencies * Add support for Markdown * update yarn lockfile * Fix npm dependencies * Use .feature.md extension. Update dependencies. Co-authored-by: aurelien-reeves <aurelien.reeves@smartbear.com> Co-authored-by: davidgoss <david@davidgoss.co>
* pass relativeTo to gherkin-streams * fix json formatter * remove more usages of relative * another one * another one * last one * lint * fix this test * fix this test * add changelog Co-authored-by: Aslak Hellesøy <1000+aslakhellesoy@users.noreply.github.com>
This reverts commit 5a21c22.
* generate html report on runs * reinstate original change This reverts commit 8a54a1b. * update test * fix pickle filter for windows
* add tag to feature * retry config for feature-test run
* make cck fail: remove reordering of testCase messages * add new function to deal with testCase * dont emit testCase from PickleRunner * include in result * fix up some tests * move tests to right places * emit test cases from serial runtime * scrappy impl to get serial working * remove unused field * refactor structures, fix tests * make coordinator api more promisey * start to hook up parallel * assemble test cases without ITestStep * remove unused function * TestCase is source of truth * TestCaseRunner is more accurate than PickleRunner? * make parallel runtime work with this * add explanatory comment * fix progress bar formatter counts * changelog * remove temp tag Co-authored-by: Aurélien Reeves <aurelien.reeves@smartbear.com> * clarify changelog entry audience * cleanup Co-authored-by: Aurélien Reeves <aurelien.reeves@smartbear.com>
Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Renovate Bot <bot@renovateapp.com>
This reverts commit 85b0f1a.
Co-authored-by: Aurélien Reeves <aurelien.reeves@smartbear.com>
…er#1692) * document change of after hook result * better wording * whoops * Update docs/migration.md Co-authored-by: Aurélien Reeves <aurelien.reeves@smartbear.com> Co-authored-by: Aurélien Reeves <aurelien.reeves@smartbear.com>
…#1568) Co-authored-by: Aslak Hellesøy <1000+aslakhellesoy@users.noreply.github.com> Co-authored-by: Aurélien Reeves <aurelien.reeves@smartbear.com> Co-authored-by: David Goss <david@davidgoss.co>
* chore(deps): update eslint packages * autofix prettier Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Charles Rudolph <charles.w.rudolph@gmail.com>
* type this as any in user fns, add test * update changelog * setWorldConstructor for completeness * use generics to do it right * Update CHANGELOG.md * use a clearer generic type name
This reverts commit dbcb177.
* ensure hook parameters are exported * dont need to mark this arg as possibly undefined * export runtime options * expose formatter options
…r#1868) * install lib * WIP * bump other cucumber deps * finish impl * add changelog * redundant comment * update library, simplify mapping * simplify again * update changelog
* Replace regex with cucumber expression. We decided to split the step definition into two. So that the patterns used be simpler. Co-authored-by: Blaise Pabon <blaise@gmail.com> Co-authored-by: Matt Wynne <matt@cucumber.io> Co-authored-by: Dane Parchment Jr <dparchmentjr@gmail.com> * Fix linting issues Co-authored-by: Blaise Pabon <blaise@gmail.com> Co-authored-by: Matt Wynne <matt@cucumber.io> Co-authored-by: Dane Parchment Jr <dparchmentjr@gmail.com> Co-authored-by: aurelien-reeves <aurelien.reeves@smartbear.com>
* Replace 2 instance of regex with cucumber expression * Fixing linting issues * Optimizing const string * Making Prettier: from " to '
Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: David Goss <david@davidgoss.co>
…mber#1881) Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: David Goss <david@davidgoss.co>
Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: David Goss <david@davidgoss.co>
* chore(deps): update eslint packages * Update eslint configuration - remove plugins which prevent upgrading eslint - update the configuration based on the one from cucumber-expression - update a piece of code to make linting happy Note: some rules have been deactivated to make the update of eslint possible without breaking our build. Those rules may be deactivated later as part of dedicated pull requests. * Activate eslint-plugin-simple-import-sort * Add simple-import-sort to dependency-lint ignore list * Revert "Add simple-import-sort to dependency-lint ignore list" This reverts commit 1bd2f32. * Revert "Activate eslint-plugin-simple-import-sort" This reverts commit a0075e7. * Remove eslint-plugin-simple-import-sort Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: aurelien-reeves <aurelien.reeves@smartbear.com>
* Update package.json A Security Vuln was identified in the Colors package for >1.4.0, offending packages being `1.4.1`, `1.4.44-liberty` - [source1](https://twitter.com/snyksec/status/1480286811482206216?ref_src=twsrc%5Egoogle%7Ctwcamp%5Eserp%7Ctwgr%5Etweet) - [source2](https://twitter.com/snyksec/status/1480286811482206216?ref_src=twsrc%5Egoogle%7Ctwcamp%5Eserp%7Ctwgr%5Etweet) - [source3](https://security.snyk.io/vuln/SNYK-JS-COLORS-2331906) This PR pins the color package to `1.4.0` as advised on the [snyk page](https://snyk.io/blog/open-source-maintainer-pulls-the-plug-on-npm-packages-colors-and-faker-now-what/) * chore: update changelog * fix: update and pin cli-table3@0.6.1 * chore: update CHANGELOG
Co-authored-by: Blaise Pabon <blaise@gmail.com> Co-authored-by: Kate Dames <kate.funficient@gmail.com>
This is a more conventional place to store prettier config, and it means that VSCode's prettier plugin can automatically find it.
* swap out dependencies * reimpl * add changelog entry * remove unused import
* Replace use of `any` type with `messages.Envelope` Part of cucumber#1648 Co-authored-by: Kate Dames <kate.funficient@gmail.com> Co-authored-by: Emmanuel Ola <54866720+eoola@users.noreply.github.com> * Replace use of `any` with a custom World in CCK example Part of cucumber#1648 Co-authored-by: Emmanuel Ola <54866720+eoola@users.noreply.github.com> Co-authored-by: Blaise Pabon <blaise@gmail.com> Co-authored-by: Kate Dames <kate.funficient@gmail.com> * Replace another use of `any` with a custom type Co-authored-by: Blaise Pabon <blaise@gmail.com> Co-authored-by: Kate Dames <kate.funficient@gmail.com> * Replace another use of `any` type Co-authored-by: Blaise Pabon <blaise@gmail.com> Co-authored-by: Kate Dames <kate.funficient@gmail.com> Co-authored-by: Kate Dames <kate.funficient@gmail.com> Co-authored-by: Emmanuel Ola <54866720+eoola@users.noreply.github.com> Co-authored-by: Blaise Pabon <blaise@gmail.com>
* Update profiles.md * Update docs/profiles.md Co-authored-by: Aurélien Reeves <aurelien.reeves@smartbear.com> Co-authored-by: Aurélien Reeves <aurelien.reeves@smartbear.com>
Co-authored-by: Blaise Pabon <blaise@gmail.com> Co-authored-by: Kate Dames <kate.funficient@gmail.com>
# Conflicts: # src/runtime/parallel/coordinator.ts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.