diff --git a/.rubocop.yml b/.rubocop.yml index 8bbad8784..fc87323d8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,4 +1,6 @@ require: + - rubocop-capybara + - rubocop-factory_bot - rubocop-performance - rubocop-rails - rubocop-rspec @@ -18,6 +20,24 @@ Bundler/OrderedGems: Enabled: true ConsiderPunctuation: true +Capybara/CurrentPathExpectation: + Enabled: true + +Capybara/NegationMatcher: + Enabled: true + +Capybara/SpecificActions: + Enabled: true + +Capybara/VisibilityMatcher: + Enabled: true + +FactoryBot/ConsistentParenthesesStyle: + Enabled: true + +FactoryBot/FactoryClassName: + Enabled: true + Layout/ArgumentAlignment: Enabled: true @@ -474,24 +494,12 @@ RSpec/BeNil: Enabled: true EnforcedStyle: be -RSpec/Capybara/CurrentPathExpectation: - Enabled: true - RSpec/Capybara/FeatureMethods: Enabled: true EnabledMethods: - scenario - xscenario -RSpec/Capybara/NegationMatcher: - Enabled: true - -RSpec/Capybara/SpecificActions: - Enabled: true - -RSpec/Capybara/VisibilityMatcher: - Enabled: true - RSpec/ContextMethod: Enabled: true @@ -521,12 +529,6 @@ RSpec/ExampleWording: RSpec/ExcessiveDocstringSpacing: Enabled: true -RSpec/FactoryBot/ConsistentParenthesesStyle: - Enabled: true - -RSpec/FactoryBot/FactoryClassName: - Enabled: true - RSpec/FilePath: Enabled: true diff --git a/Gemfile b/Gemfile index dda3e6d4c..44877da91 100644 --- a/Gemfile +++ b/Gemfile @@ -107,9 +107,11 @@ group :development do gem "pronto-rubocop", "~> 0.11.5", require: false gem "pronto-scss", "~> 0.11.0", require: false gem "rubocop", "~> 1.56.2", require: false + gem "rubocop-capybara", "~> 2.18.0", require: false + gem "rubocop-factory_bot", "~> 2.23.1", require: false gem "rubocop-performance", "~> 1.19.0", require: false gem "rubocop-rails", "~> 2.20.2", require: false - gem "rubocop-rspec", "~> 2.17.1", require: false + gem "rubocop-rspec", "~> 2.23.2", require: false gem "rvm1-capistrano3", "~> 1.4.0", require: false gem "scss_lint", "~> 0.60.0", require: false gem "web-console", "~> 4.2.0" diff --git a/Gemfile.lock b/Gemfile.lock index c2da51788..960699a7c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -529,6 +529,10 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) + rubocop-capybara (2.18.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.23.1) + rubocop (~> 1.33) rubocop-performance (1.19.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -536,8 +540,10 @@ GEM activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-rspec (2.17.1) + rubocop-rspec (2.23.2) rubocop (~> 1.33) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) ruby-vips (2.1.4) ffi (~> 1.12) @@ -747,9 +753,11 @@ DEPENDENCIES ros-apartment (~> 2.11.0) rspec-rails (~> 5.1.2) rubocop (~> 1.56.2) + rubocop-capybara (~> 2.18.0) + rubocop-factory_bot (~> 2.23.1) rubocop-performance (~> 1.19.0) rubocop-rails (~> 2.20.2) - rubocop-rspec (~> 2.17.1) + rubocop-rspec (~> 2.23.2) rvm1-capistrano3 (~> 1.4.0) sassc-rails (~> 2.1.2) savon (~> 2.14.0)