diff --git a/.rubocop.yml b/.rubocop.yml index 91f752d3..6cf84967 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -15,6 +15,9 @@ AllCops: - gemfiles/vendor/bundle/**/* # This dir only shows up on travis ¯\_(ツ)_/¯ - spec/dummy_app/db/schema.rb # Generated, out of our control + # Enable pending cops so we can adopt the code before they are switched on. + NewCops: enable + # Set to lowest supported version TargetRubyVersion: 2.4 diff --git a/paper_trail.gemspec b/paper_trail.gemspec index b33ecd41..125698f3 100644 --- a/paper_trail.gemspec +++ b/paper_trail.gemspec @@ -44,7 +44,7 @@ has been destroyed. s.add_development_dependency "paper_trail-association_tracking", "~> 2.0.0" s.add_development_dependency "rake", "~> 13.0" s.add_development_dependency "rspec-rails", "~> 4.0" - s.add_development_dependency "rubocop", "~> 0.82.0" + s.add_development_dependency "rubocop", "~> 0.85.1" s.add_development_dependency "rubocop-performance", "~> 1.4" s.add_development_dependency "rubocop-rspec", "~> 1.35" diff --git a/spec/dummy_app/app/models/song.rb b/spec/dummy_app/app/models/song.rb index be7cc812..1c655e31 100644 --- a/spec/dummy_app/app/models/song.rb +++ b/spec/dummy_app/app/models/song.rb @@ -34,6 +34,7 @@ class Song < ActiveRecord::Base attribute :name, :string else attr_accessor :name + prepend OverrideSongAttributesTheRails4Way end end