Update dependencies: activerecord, rubocop

.rubocop.yml

@@ -95,6 +95,16 @@ Naming/PredicateName:
 Naming/UncommunicativeMethodParamName:
   Enabled: false
 
+# This cop does not work correctly in rubocop-rspec 1.27.0
+RSpec/EmptyLineAfterExampleGroup:
+  Enabled: false
+
+# Yes, ideally examples would be short. Is it possible to pick a limit and say,
+# "no example will ever be longer than this"? Hard to say. Sometimes they're
+# quite long.
+RSpec/ExampleLength:
+  Enabled: false
+
 RSpec/FilePath:
   Exclude:
     - spec/paper_trail/association_reify_error_behaviour/error.rb
@@ -108,12 +118,6 @@ RSpec/FilePath:
 RSpec/MultipleExpectations:
   Enabled: false
 
-# Yes, ideally examples would be short. Is it possible to pick a limit and say,
-# "no example will ever be longer than this"? Hard to say. Sometimes they're
-# quite long.
-RSpec/ExampleLength:
-  Enabled: false
-
 # Please use semantic style, e.g. `do` when there's a side-effect, else `{}`.
 # The semantic style is too nuanced to lint, so the cop is disabled.
 Style/BlockDelimiters:

Appraisals

@@ -16,18 +16,10 @@ end
 
 appraise "ar-5.1" do
   gem "activerecord", "~> 5.1.5"
-  gem "rails-controller-testing"
+  gem "rails-controller-testing", "~> 1.0.2"
 end
 
 appraise "ar-5.2" do
-  gem "activerecord", "~> 5.2.0.rc2"
-  gem "rails-controller-testing"
-
-  # bundler does not handle rc versions well
-  # https://github.com/paper-trail-gem/paper_trail/pull/1067
-  # so we specify activesupport, actionpack, and railties, which we
-  # would not normally do, as you can see with other rails versions above.
-  gem "activesupport", "~> 5.2.0.rc2"
-  gem "actionpack", "~> 5.2.0.rc2"
-  gem "railties", "~> 5.2.0.rc2"
+  gem "activerecord", "~> 5.2.1"
+  gem "rails-controller-testing", "~> 1.0.2"
 end

gemfiles/ar_5.1.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 5.1.5"
-gem "rails-controller-testing"
+gem "rails-controller-testing", "~> 1.0.2"
 
 gemspec path: "../"

gemfiles/ar_5.2.gemfile

@@ -2,10 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.2.0.rc2"
-gem "rails-controller-testing"
-gem "activesupport", "~> 5.2.0.rc2"
-gem "actionpack", "~> 5.2.0.rc2"
-gem "railties", "~> 5.2.0.rc2"
+gem "activerecord", "~> 5.2.1"
+gem "rails-controller-testing", "~> 1.0.2"
 
 gemspec path: "../"

paper_trail.gemspec

@@ -48,7 +48,7 @@ has been destroyed.
   s.add_development_dependency "pg", "~> 0.21.0"
   s.add_development_dependency "rake", "~> 12.3"
   s.add_development_dependency "rspec-rails", "~> 3.7.2"
-  s.add_development_dependency "rubocop", "~> 0.56.0"
-  s.add_development_dependency "rubocop-rspec", "~> 1.25.1"
+  s.add_development_dependency "rubocop", "~> 0.58.2"
+  s.add_development_dependency "rubocop-rspec", "~> 1.27.0"
   s.add_development_dependency "sqlite3", "~> 1.3"
 end

spec/controllers/widgets_controller_spec.rb

@@ -4,6 +4,7 @@ require "spec_helper"
 
 RSpec.describe WidgetsController, type: :controller, versioning: true do
   before { request.env["REMOTE_ADDR"] = "127.0.0.1" }
+
   after { RequestStore.store[:paper_trail] = nil }
 
   describe "#create" do

spec/models/boolit_spec.rb

@@ -33,6 +33,7 @@ RSpec.describe Boolit, type: :model, versioning: true do
         boolit.update_attributes!(name: nil)
         boolit.update_attributes!(name: FFaker::Name.name)
       end
+
       after { PaperTrail.serializer = PaperTrail::Serializers::YAML }
 
       it "does not overwrite that attribute during the reification process" do