Merge pull request #122 from publify/update-rubocop-configuration

Update RuboCop configuration and autocorrect new offenses

Author: mvz

.rubocop.yml

@@ -4,10 +4,13 @@ inherit_mode:
   merge:
     - Exclude
 
-require:
+plugins:
+  - rubocop-capybara
+  - rubocop-factory_bot
   - rubocop-performance
   - rubocop-rails
   - rubocop-rspec
+  - rubocop-rspec_rails
 
 AllCops:
   Exclude:
@@ -20,14 +23,19 @@ AllCops:
 Rails:
   Enabled: true
 
-# We have duplication due to extra logic in the Gemfile
-Bundler/DuplicatedGem:
-  Enabled: false
+# Require tests to specify whether an element is a link or a button
+Capybara/ClickLinkOrButtonStyle:
+  EnforcedStyle: strict
+
+# Match style of regular expectations
+Capybara/NegationMatcher:
+  EnforcedStyle: not_to
 
 # Put development dependencies in the gemspec so rubygems.org knows about them
 Gemspec/DevelopmentDependencies:
   EnforcedStyle: gemspec
 
+# Make BeginEndAlignment behavior match EndAlignment
 Layout/BeginEndAlignment:
   EnforcedStyleAlignWith: begin
 
@@ -103,6 +111,10 @@ Rails/SkipsModelValidations:
   Exclude:
     - 'spec/dummy/db/migrate/*'
 
+# Spec type inference is disabled, so this cop must be disabled too.
+RSpecRails/InferredSpecType:
+  Enabled: false
+
 # Allow the use of 'and' 'or' in control structures.
 Style/AndOr:
   EnforcedStyle: conditionals
@@ -163,14 +175,6 @@ Style/StringLiteralsInInterpolation:
 Style/SymbolArray:
   EnforcedStyle: brackets
 
-# Prefer consistent lines for multi-line arrays
-Style/TrailingCommaInArrayLiteral:
-  EnforcedStyleForMultiline: comma
-
-# Prefer consistent lines for multi-line hashes
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: comma
-
 # Allow small arrays of words with quotes
 Style/WordArray:
   MinSize: 4

publify_textfilter_code.gemspec

@@ -25,9 +25,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency "appraisal", "~> 2.3"
   s.add_development_dependency "rspec-rails", "~> 6.0"
   s.add_development_dependency "rubocop", "~> 1.80.2"
+  s.add_development_dependency "rubocop-capybara", "~> 2.22.1"
+  s.add_development_dependency "rubocop-factory_bot", "~> 2.27.1"
   s.add_development_dependency "rubocop-performance", "~> 1.25.0"
   s.add_development_dependency "rubocop-rails", "~> 2.33.3"
   s.add_development_dependency "rubocop-rspec", "~> 3.7.0"
+  s.add_development_dependency "rubocop-rspec_rails", "~> 2.31.0"
   s.add_development_dependency "simplecov", "~> 0.22.0"
   s.add_development_dependency "sqlite3", "~> 1.4"
   s.metadata["rubygems_mfa_required"] = "true"

spec/dummy/config/environments/development.rb

@@ -21,7 +21,7 @@
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
-      "Cache-Control" => "public, max-age=#{2.days.to_i}",
+      "Cache-Control" => "public, max-age=#{2.days.to_i}"
     }
   else
     config.action_controller.perform_caching = false

spec/dummy/config/environments/test.rb

@@ -17,7 +17,7 @@
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    "Cache-Control" => "public, max-age=#{1.hour.to_i}",
+    "Cache-Control" => "public, max-age=#{1.hour.to_i}"
   }
 
   # Show full error reports and disable caching.