From fa45917d6fa63730afe0686cea245770d1eccd77 Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sbx.pm>
Date: Tue, 19 Jul 2022 12:13:50 +0200
Subject: [PATCH] added rubocop-rails

---
 .rubocop.yml                                           | 4 +++-
 Gemfile                                                | 3 ++-
 Gemfile.lock                                           | 7 ++++++-
 test/integration/subscriptions/create_as_admin_test.rb | 1 -
 test/integration/subscriptions/create_as_user_test.rb  | 2 +-
 test/integration/subscriptions/renew_as_admin_test.rb  | 1 -
 test/integration/subscriptions/renew_as_user_test.rb   | 2 +-
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index a3b552137..b037a56b2 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,6 +1,8 @@
+require: rubocop-rails
+
 AllCops:
   NewCops: enable
-Metrics/LineLength:
+Layout/LineLength:
   Max: 140
 Metrics/MethodLength:
   Max: 35
diff --git a/Gemfile b/Gemfile
index a8b962ea1..20eb79493 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,7 +39,8 @@ group :development do
   gem 'rb-readline'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'railroady'
-  gem 'rubocop', '~> 1.31.2'
+  gem 'rubocop', '~> 1.31', require: false
+  gem 'rubocop-rails', require: false
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index c76abd469..278d67d6e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -370,6 +370,10 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.19.1)
       parser (>= 3.1.1.0)
+    rubocop-rails (2.15.2)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.7.0, < 2.0)
     ruby-progressbar (1.10.1)
     ruby-rc4 (0.1.5)
     ruby-vips (2.1.4)
@@ -541,7 +545,8 @@ DEPENDENCIES
   repost
   responders (~> 2.0)
   rolify
-  rubocop (~> 1.31.2)
+  rubocop (~> 1.31)
+  rubocop-rails
   rubyXL
   rubyzip (>= 1.3.0)
   sassc (= 2.1.0)
diff --git a/test/integration/subscriptions/create_as_admin_test.rb b/test/integration/subscriptions/create_as_admin_test.rb
index 54856a5e3..bf38753b6 100644
--- a/test/integration/subscriptions/create_as_admin_test.rb
+++ b/test/integration/subscriptions/create_as_admin_test.rb
@@ -38,7 +38,6 @@ class Subscriptions::CreateAsAdminTest < ActionDispatch::IntegrationTest
     subscription = Invoice.find(result[:id]).invoice_items.first.object
     assert_equal plan.id, subscription.plan_id, 'subscribed plan does not match'
 
-
     # Check that the user has only one subscription
     assert_equal 1, user.subscriptions.count
 
diff --git a/test/integration/subscriptions/create_as_user_test.rb b/test/integration/subscriptions/create_as_user_test.rb
index 8679e1c8d..b947be596 100644
--- a/test/integration/subscriptions/create_as_user_test.rb
+++ b/test/integration/subscriptions/create_as_user_test.rb
@@ -100,7 +100,7 @@ class Subscriptions::CreateAsUserTest < ActionDispatch::IntegrationTest
     assert_equal Mime[:json], response.content_type
 
     # Check the error was handled
-    assert_match /plan is not compatible/, response.body
+    assert_match(/plan is not compatible/, response.body)
 
     # Check that the user has no subscription
     assert_nil @user.subscription, "user's subscription was found"
diff --git a/test/integration/subscriptions/renew_as_admin_test.rb b/test/integration/subscriptions/renew_as_admin_test.rb
index a454bacda..f24e98ed0 100644
--- a/test/integration/subscriptions/renew_as_admin_test.rb
+++ b/test/integration/subscriptions/renew_as_admin_test.rb
@@ -4,7 +4,6 @@ require 'test_helper'
 
 module Subscriptions; end
 
-
 class Subscriptions::RenewAsAdminTest < ActionDispatch::IntegrationTest
   setup do
     @admin = User.find_by(username: 'admin')
diff --git a/test/integration/subscriptions/renew_as_user_test.rb b/test/integration/subscriptions/renew_as_user_test.rb
index d238fe066..bab37f8a5 100644
--- a/test/integration/subscriptions/renew_as_user_test.rb
+++ b/test/integration/subscriptions/renew_as_user_test.rb
@@ -104,7 +104,7 @@ class Subscriptions::RenewAsUserTest < ActionDispatch::IntegrationTest
     assert_equal Mime[:json], response.content_type
 
     # Check the error was handled
-    assert_match /Your card was declined/, response.body
+    assert_match(/Your card was declined/, response.body)
 
     # Check that the user's subscription has not changed
     assert_equal previous_expiration, @user.subscription.expired_at.to_i, "user's subscription has changed"