Skip to content

Commit

Permalink
Merge with master
Browse files Browse the repository at this point in the history
  • Loading branch information
aslakhellesoy committed Nov 24, 2017
2 parents 144f341 + 201cc8c commit 6742a2e
Show file tree
Hide file tree
Showing 107 changed files with 462 additions and 504 deletions.
36 changes: 16 additions & 20 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
version: 2.0

jobs:
publish:
machine: true
steps:
- checkout
- run: git remote add cucumber-pro [email protected]:cucumber-ruby.git
- run: git push cucumber-pro $CIRCLE_BRANCH
"ruby-2.4.1":
docker:
- image: circleci/ruby:2.4.1
Expand All @@ -23,11 +29,8 @@ jobs:
- ./vendor/bundle
key: bundle-{{ checksum "Gemfile.lock" }}
- run:
name: Run RSpec
command: bundle exec rake spec
- run:
name: Run Cucumber
command: bundle exec rake cucumber
name: Run Rake
command: bundle exec rake

"ruby-2.3.5":
docker:
Expand All @@ -47,11 +50,8 @@ jobs:
- ./vendor/bundle
key: bundle-{{ checksum "Gemfile.lock" }}
- run:
name: Run RSpec
command: bundle exec rake spec
- run:
name: Run Cucumber
command: bundle exec rake cucumber
name: Run Rake
command: bundle exec rake

"ruby-2.2.8":
docker:
Expand All @@ -71,11 +71,8 @@ jobs:
- ./vendor/bundle
key: bundle-{{ checksum "Gemfile.lock" }}
- run:
name: Run RSpec
command: bundle exec rake spec
- run:
name: Run Cucumber
command: bundle exec rake cucumber
name: Run Rake
command: bundle exec rake

"jruby-9.1.13.0":
docker:
Expand All @@ -95,17 +92,16 @@ jobs:
- ./vendor/bundle
key: bundle-{{ checksum "Gemfile.lock" }}
- run:
name: Run RSpec
command: bundle exec rake spec
- run:
name: Run Cucumber
command: bundle exec rake cucumber
name: Run Rake
command: bundle exec rake

workflows:
version: 2
build:
jobs:
# Keep lowest ruby-* version in sync with .cucumber.gemspec
- "ruby-2.4.1"
- "ruby-2.3.5"
- "ruby-2.2.8"
- "jruby-9.1.13.0"
- publish
1 change: 0 additions & 1 deletion .coveralls.yml

This file was deleted.

17 changes: 17 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
# Issues with these labels will never be considered stale
exemptLabels:
- Slow Burner
# Label to use when marking an issue as stale
staleLabel: Stale
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed in a week if no further activity occurs.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: >
This issue has been automatically closed because of inactivity.
You can support the Cucumber core team on [opencollective](https://opencollective.com/cucumber).
27 changes: 27 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,30 @@ AllCops:
DisplayStyleGuide: true
Exclude:
- 'tmp/**/*'
- 'vendor/**/*'
- 'lib/cucumber/formatter/legacy_api/*'
- 'spec/cucumber/formatter/legacy_api/*'

# Reviewed: please see PR-1022 for details on why this cop is disabled: https://github.com/cucumber/cucumber-ruby/pull/1022
Lint/AmbiguousOperator:
Enabled: False

# Reviewed: in pretty_spec.rb, progress_spec.rb offences look false,
# as the trailing spaces are in multiline string literals
Style/TrailingWhitespace:
Exclude:
- 'spec/cucumber/formatter/pretty_spec.rb'
- 'spec/cucumber/formatter/progress_spec.rb'

# Reviewed: these offenses look false as the variables are in cyrillic
Style/VariableName:
Exclude:
- 'examples/i18n/ru/features/step_definitions/calculator_steps.rb'
- 'examples/i18n/uk/features/step_definitions/calculator_steps.rb'
- 'examples/i18n/uz/features/step_definitions/calculator_steps.rb'

# Reviewed: Formatters put trailing spaces after things like 'Feature: '
Style/TrailingWhitespace:
Exclude:
- 'spec/cucumber/formatter/pretty_spec.rb'
- 'spec/cucumber/formatter/progress_spec.rb'
Loading

0 comments on commit 6742a2e

Please sign in to comment.