From a9db49e729bc62a154f9b5bc8b317e72d87d3a93 Mon Sep 17 00:00:00 2001 From: Mikus Date: Thu, 13 Jun 2024 12:35:01 +0300 Subject: [PATCH 1/4] update for 3.0.0 --- gc_ruboconfig.gemspec | 5 ++++- rubocop.yml | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gc_ruboconfig.gemspec b/gc_ruboconfig.gemspec index f2f0ca3..27ed888 100644 --- a/gc_ruboconfig.gemspec +++ b/gc_ruboconfig.gemspec @@ -11,7 +11,10 @@ Gem::Specification.new do |spec| spec.files = ['rubocop.yml', 'rails.yml'] spec.add_dependency 'rubocop', '>= 1.63' + spec.add_dependency 'rubocop-capybara', '>= 2.21.0' + spec.add_dependency 'rubocop-factory_bot', '>= 2.26.1' spec.add_dependency 'rubocop-performance', '>= 1.21' spec.add_dependency 'rubocop-rails', '>= 2.25.0' - spec.add_dependency 'rubocop-rspec', '>= 2.29.2' + spec.add_dependency 'rubocop-rspec', '>= 3.0.1' + spec.add_dependency 'rubocop-rspec_rails', '>= 2.30.0' end diff --git a/rubocop.yml b/rubocop.yml index 80f0780..30f899f 100644 --- a/rubocop.yml +++ b/rubocop.yml @@ -1,6 +1,10 @@ require: - rubocop-rspec - rubocop-performance + - rubocop-factory_bot + - rubocop-capybara + - rubocop-rails + - rubocop-rspec_rails AllCops: DisplayCopNames: true From 9079d8d1942b7f4bfb1b06ef5423c2c31fc17fec Mon Sep 17 00:00:00 2001 From: Mikus Date: Thu, 13 Jun 2024 12:44:36 +0300 Subject: [PATCH 2/4] version bump --- gc_ruboconfig.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gc_ruboconfig.gemspec b/gc_ruboconfig.gemspec index 27ed888..ceddae8 100644 --- a/gc_ruboconfig.gemspec +++ b/gc_ruboconfig.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = 'gc_ruboconfig' - spec.version = '4.5.0' + spec.version = '4.6.0' spec.summary = "GoCardless's shared Rubocop configuration, conforming to our house style" spec.authors = %w[GoCardless] spec.homepage = 'https://github.com/gocardless/ruboconfig' From 950d0c3fb23465847477db0c767d8e243e6b2111 Mon Sep 17 00:00:00 2001 From: Mikus Date: Thu, 13 Jun 2024 12:46:37 +0300 Subject: [PATCH 3/4] change log --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5238b7f..e7f8b4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Changelog ========= +4.6.0 +----- +* Adjustment for supporting rubocop-rspec 3.0.0 >= + 4.5.0 ----- * Drop support for Ruby 2.7 From 2474ac0e81eeb8babf5ab142645ef468b8e593ae Mon Sep 17 00:00:00 2001 From: Mikus Date: Thu, 13 Jun 2024 13:46:58 +0300 Subject: [PATCH 4/4] ceperate out capybara cop --- CHANGELOG.md | 13 ++++++++++++- capybara.yml | 16 ++++++++++++++++ gc_ruboconfig.gemspec | 5 ++--- rails.yml | 1 + rubocop.yml | 17 ----------------- 5 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 capybara.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index e7f8b4f..a73baeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,20 @@ Changelog ========= -4.6.0 +5.0.0 ----- * Adjustment for supporting rubocop-rspec 3.0.0 >= +* Bringing out out capybara cop in its own file. + * This require 'rubocop-capybara' gem to be added to support the cop rules. + +Example: +```yaml +inherit_gem: + gc_ruboconfig: + - rubocop.yml + - rails.yml + - capybara.yml +``` 4.5.0 ----- diff --git a/capybara.yml b/capybara.yml new file mode 100644 index 0000000..388ad08 --- /dev/null +++ b/capybara.yml @@ -0,0 +1,16 @@ +require: + - rubocop-capybara + +# new in 2.13 +Capybara/SpecificFinders: + Enabled: true + +# new in 2.12 +Capybara/SpecificMatcher: + Enabled: true + +Capybara/NegationMatcher: # new in 2.14 + Enabled: true + +Capybara/SpecificActions: # new in 2.14 + Enabled: false diff --git a/gc_ruboconfig.gemspec b/gc_ruboconfig.gemspec index ceddae8..f51f49d 100644 --- a/gc_ruboconfig.gemspec +++ b/gc_ruboconfig.gemspec @@ -2,16 +2,15 @@ Gem::Specification.new do |spec| spec.name = 'gc_ruboconfig' - spec.version = '4.6.0' + spec.version = '5.0.0' spec.summary = "GoCardless's shared Rubocop configuration, conforming to our house style" spec.authors = %w[GoCardless] spec.homepage = 'https://github.com/gocardless/ruboconfig' spec.email = %w[developers@gocardless.com] spec.license = 'MIT' - spec.files = ['rubocop.yml', 'rails.yml'] + spec.files = ['rubocop.yml', 'rails.yml', 'capybara.yml'] spec.add_dependency 'rubocop', '>= 1.63' - spec.add_dependency 'rubocop-capybara', '>= 2.21.0' spec.add_dependency 'rubocop-factory_bot', '>= 2.26.1' spec.add_dependency 'rubocop-performance', '>= 1.21' spec.add_dependency 'rubocop-rails', '>= 2.25.0' diff --git a/rails.yml b/rails.yml index d6d4f5d..4d75e69 100644 --- a/rails.yml +++ b/rails.yml @@ -1,5 +1,6 @@ require: - rubocop-rails + - rubocop-rspec_rails Rails/AddColumnIndex: Enabled: false diff --git a/rubocop.yml b/rubocop.yml index 30f899f..537fd5e 100644 --- a/rubocop.yml +++ b/rubocop.yml @@ -2,9 +2,6 @@ require: - rubocop-rspec - rubocop-performance - rubocop-factory_bot - - rubocop-capybara - - rubocop-rails - - rubocop-rspec_rails AllCops: DisplayCopNames: true @@ -646,14 +643,6 @@ RSpec/ClassCheck: RSpec/NoExpectationExample: Enabled: false -# new in 2.13 -Capybara/SpecificFinders: - Enabled: true - -# new in 2.12 -Capybara/SpecificMatcher: - Enabled: true - Lint/DuplicateMagicComment: # new in 1.37 Enabled: true @@ -666,12 +655,6 @@ Style/RedundantStringEscape: # new in 1.37 RSpec/SortMetadata: # new in 2.14 Enabled: true -Capybara/NegationMatcher: # new in 2.14 - Enabled: true - -Capybara/SpecificActions: # new in 2.14 - Enabled: false - # Seems to be buggy, causes an infinite loop for `subjects` named `create` FactoryBot/ConsistentParenthesesStyle: # new in 2.14 Enabled: false