From 8eaa8861ef9a197269183a1f9ad73f33d35ceccf Mon Sep 17 00:00:00 2001
From: aki <lala.akira@gmail.com>
Date: Wed, 18 Jan 2023 13:27:07 +0900
Subject: [PATCH] rubocop-rspec@2.18.0

---
 lib/sgcop/version.rb |  2 +-
 rails/rubocop.yml    | 16 +++++++++++-----
 sgcop.gemspec        |  3 ++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/sgcop/version.rb b/lib/sgcop/version.rb
index adc1405..e9516d7 100644
--- a/lib/sgcop/version.rb
+++ b/lib/sgcop/version.rb
@@ -1,3 +1,3 @@
 module Sgcop
-  VERSION = '0.7.14'.freeze
+  VERSION = '0.8.0'.freeze
 end
diff --git a/rails/rubocop.yml b/rails/rubocop.yml
index b8f0a7a..e0c0cc3 100644
--- a/rails/rubocop.yml
+++ b/rails/rubocop.yml
@@ -3,6 +3,7 @@ inherit_from: ../ruby/rubocop.yml
 require:
   - rubocop-rails
   - rubocop-rspec
+  - rubocop-capybara
   - rubocop-performance
   - rubocop-rake
   - sgcop
@@ -30,6 +31,11 @@ AllCops:
 Rails:
   Enabled: true
 
+# NOTE: rubocop-rspecとは分離されたので旧ネームスペースは無効化
+# SEE: https://github.com/rubocop/rubocop-rspec/issues/1561
+RSpec/Capybara:
+  Enabled: false
+
 # ARオブジェクトのuniqを取りたいわけでなく、特定の属性のuniqが取りたい場合でも警告が出るので
 # https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsuniqbeforepluck
 Rails/UniqBeforePluck:
@@ -434,7 +440,7 @@ RSpec/VerifiedDoubleReference: # new in 2.10.0
 RSpec/ChangeByZero: # new in 2.11.0
   Enabled: true
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec_capybara.html#rspeccapybaraspecificmatcher
-RSpec/Capybara/SpecificMatcher: # new in 2.12
+Capybara/SpecificMatcher: # new in 2.12
   Enabled: true
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec_rails.html#rspecrailshavehttpstatus
 RSpec/Rails/HaveHttpStatus: # new in 2.12
@@ -446,16 +452,16 @@ RSpec/ClassCheck: # new in 2.13
 RSpec/NoExpectationExample: # new in 2.13
   Enabled: true
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec_capybara.html#rspeccapybaraspecificfinders
-RSpec/Capybara/SpecificFinders: # new in 2.13
+Capybara/SpecificFinders: # new in 2.13
   Enabled: true
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecsortmetadata
 RSpec/SortMetadata: # new in 2.14
   Enabled: true
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec_capybara.html#rspeccapybaranegationmatcher
-RSpec/Capybara/NegationMatcher: # new in 2.14
+Capybara/NegationMatcher: # new in 2.14
   Enabled: false
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec_capybara.html#rspeccapybaraspecificactions
-RSpec/Capybara/SpecificActions: # new in 2.14
+Capybara/SpecificActions: # new in 2.14
   Enabled: true
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec_factorybot.html#rspecfactorybotconsistentparenthesesstyle
 RSpec/FactoryBot/ConsistentParenthesesStyle: # new in 2.14
@@ -473,7 +479,7 @@ RSpec/PendingWithoutReason: # new in 2.16
 RSpec/FactoryBot/FactoryNameStyle: # new in 2.16
   Enabled: true
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec_capybara.html#rspeccapybaramatchstyle
-RSpec/Capybara/MatchStyle: # new in 2.17
+Capybara/MatchStyle: # new in 2.17
   Enabled: true
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec_rails.html#rspecrailsminitestassertions
 RSpec/Rails/MinitestAssertions: # new in 2.17
diff --git a/sgcop.gemspec b/sgcop.gemspec
index 51e5d03..42e4956 100644
--- a/sgcop.gemspec
+++ b/sgcop.gemspec
@@ -32,8 +32,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.9'
   spec.add_development_dependency 'debug'
   spec.add_dependency 'rubocop', '~> 1.43.0'
+  spec.add_dependency 'rubocop-capybara', '~> 2.17.0'
   spec.add_dependency 'rubocop-performance', '~> 1.15.0'
   spec.add_dependency 'rubocop-rails', '~> 2.17.0'
   spec.add_dependency 'rubocop-rake', '~> 0.6.0'
-  spec.add_dependency 'rubocop-rspec', '~> 2.17.0'
+  spec.add_dependency 'rubocop-rspec', '~> 2.18.0'
 end