Skip to content

Commit d73a14c

Browse files
authored
v3: rubocop update (#581)
* Update rubocop from 1.31 to 1.45 (Large update) * AF: Style/RedundantConstantBase * AF: Style/RedundantStringEscape * Update packaging to latest version to mitigating spam deprecations * Add in latest version of rubocop-rake and reasonably up to date version of rubocop-rails * AF: Rake/Desc * Ignore Environment Rake cop * gsub_file does write to stdout or a form of it now * Update config * Partial update towards later versions of rubocop gems * Fix heredoc warnings * Fix quotes * Add changelog
1 parent 9879b81 commit d73a14c

File tree

17 files changed

+33
-90
lines changed

17 files changed

+33
-90
lines changed

.rubocop.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
require:
22
- rubocop-packaging
33
- rubocop-performance
4+
- rubocop-rails
5+
- rubocop-rake
46
- rubocop-rspec
57

68
AllCops:
@@ -24,6 +26,10 @@ Layout/LineLength:
2426
- '^When'
2527
- '^Then'
2628

29+
# This cop isn't relevant for our codebase
30+
Rails/RakeEnvironment:
31+
Enabled: false
32+
2733
# This allows us to read the chmod action in a more reproducible way
2834
Style/NumericLiteralPrefix:
2935
EnforcedOctalStyle: zero_only

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ This file is intended to be modified using the [`changelog`](github.com/cucumber
1010
## [Unreleased]
1111
### Changed
1212
- Add support for Rails 7.1 [#575](https://github.com/cucumber/cucumber-rails/pull/575)
13+
- Added new rubocop sub-gems (rails / rake) and updated versions to 2.6 ruby-conformance [#581](https://github.com/cucumber/cucumber-rails/pull/581)
1314

1415
### Fixed
1516
- Some of the rails 5.2 tests were installing lots of old conflicting gems ([luke-hill])

Rakefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,16 @@ namespace :test do
3434
end
3535

3636
namespace :gemfiles do
37-
desc 'Install dependencies for all gemfiles'
37+
desc 'Re-install dependencies for all gemfiles'
3838
task :install do
3939
system 'bundle exec appraisal update'
4040
end
4141

42+
desc 'Remove all generated gemfiles'
4243
task :clean do
4344
FileUtils.rm_rf('gemfiles/*')
4445
end
4546

46-
desc 'Rebuild generated gemfiles and install dependencies'
47+
desc 'Remove all generated gemfiles and re-install dependencies'
4748
task rebuild: %i[clean install]
4849
end

cucumber-rails.gemspec

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,12 @@ Gem::Specification.new do |s|
3636
s.add_development_dependency('rails', '>= 5.2', '< 8')
3737
s.add_development_dependency('rake', '>= 12.0')
3838
s.add_development_dependency('rspec', '~> 3.6')
39-
s.add_development_dependency('rubocop', '~> 1.31.0')
40-
s.add_development_dependency('rubocop-packaging', '~> 0.5.1')
41-
s.add_development_dependency('rubocop-performance', '~> 1.17.0')
42-
s.add_development_dependency('rubocop-rspec', '~> 2.12.0')
39+
s.add_development_dependency('rubocop', '~> 1.45.0')
40+
s.add_development_dependency('rubocop-packaging', '~> 0.5.2')
41+
s.add_development_dependency('rubocop-performance', '~> 1.17.1')
42+
s.add_development_dependency('rubocop-rails', '~> 2.18.0')
43+
s.add_development_dependency('rubocop-rake', '~> 0.6.0')
44+
s.add_development_dependency('rubocop-rspec', '~> 2.17.0')
4345

4446
# For Documentation:
4547
s.add_development_dependency('yard', '~> 0.9.10')

dev_tasks/yard.rake

Lines changed: 0 additions & 28 deletions
This file was deleted.
-1.55 KB
Binary file not shown.

dev_tasks/yard/default/layout/html/footer.erb

Lines changed: 0 additions & 5 deletions
This file was deleted.

dev_tasks/yard/default/layout/html/index.erb

Lines changed: 0 additions & 1 deletion
This file was deleted.

dev_tasks/yard/default/layout/html/layout.erb

Lines changed: 0 additions & 25 deletions
This file was deleted.

dev_tasks/yard/default/layout/html/logo.erb

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)