Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Emulate Cucumber-JS's new i18n CLI options #1140

Merged
merged 7 commits into from
Jul 3, 2017
Merged

Emulate Cucumber-JS's new i18n CLI options #1140

merged 7 commits into from
Jul 3, 2017

Conversation

aidamanna
Copy link
Contributor

@aidamanna aidamanna commented Jun 30, 2017

Summary

Emulates Cucumber-JS's new i18n CLI options.
Fixes #1137 and fixes a test.

Details

See issue #1137

Motivation and Context

Keeping things consistent between implementations.

How Has This Been Tested?

Existing tests have been modified to meet the new requirements.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

  • I've added tests for my code
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

Please review @mattwynne @tooky

@mattwynne mattwynne added status: ready to merge ⚡ enhancement Request for new functionality labels Jun 30, 2017
@brasmusson
Copy link
Contributor

@aidamanna May I suggest that you edit the pull-request description to include a keyword for closing issues, to automatically close #1137 when this pull-request is merged. For instance changing "Implements issue #1137 and fixes a test." to "Fixes #1137 and fixes a test."

elsif !::Gherkin::DIALECTS.keys.include? lang
indicate_invalid_language_and_exit(lang)
else
if ::Gherkin::DIALECTS.keys.include? lang
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that this method is shorter, could you swap this logic around round to use a Guard Clause?

i.e.

return indicate_invalid_language_and_exit(lang) if !::Gherkin::DIALECTS.keys.include? lang
list_keywords_and_exit(lang)

@mattwynne
Copy link
Member

mattwynne commented Jul 1, 2017

@aidamanna this is lovely, a great first contribution!

I see that GitHub is warning us there are merge conflicts, due to you and I both fixing the rubocop offences I left behind in scripts/update-history (sorry!).

Can you try rebasing this branch from master and then force pushing it? Give me a shout in Slack if you need a hand doing that.

@mattwynne
Copy link
Member

mattwynne commented Jul 1, 2017

Also, I think if you rebase master the build may go green - I've tagged out the scenario that seems to be flickering / timing-out on JRuby.

@aidamanna
Copy link
Contributor Author

@mattwynne little refactor done! :)

@mattwynne mattwynne merged commit 22a522a into cucumber:master Jul 3, 2017
@ghost ghost removed the status: ready to merge label Jul 3, 2017
@aidamanna aidamanna deleted the 1137-new-i18n-cli-options branch July 4, 2017 09:25
@lock
Copy link

lock bot commented Oct 25, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Oct 25, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
⚡ enhancement Request for new functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Emulate Cucumber-JS's new i18n CLI options
3 participants