Merge pull request #847 from jfragoulis/fix_master

Fix master

Author: bquorning

.rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
-require: 
+require:
  - rubocop-rspec
- - rubocop/cop/internal_affairs 
+ - rubocop/cop/internal_affairs
 
 AllCops:
   DisplayCopNames: true
@@ -13,7 +13,7 @@ AllCops:
     - 'spec/smoke_tests/**/*.rb'
 
 # See https://github.com/rubocop-hq/rubocop/issues/6410
-Layout/AlignHash:
+Layout/HashAlignment:
   Enabled: false
 
 Metrics/BlockLength:

.rubocop_todo.yml

@@ -1,11 +1,16 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-08-06 21:29:02 +0300 using RuboCop version 0.70.0.
+# on 2019-12-12 15:15:34 +0200 using RuboCop version 0.77.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 9
+# Cop supports --auto-correct.
+InternalAffairs/MethodNameEqual:
+  Enabled: false
+
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:

lib/rubocop/cop/rspec_cops.rb

@@ -9,7 +9,7 @@
 
 begin
   require_relative 'rspec/rails/http_status'
-rescue LoadError # rubocop:disable Lint/HandleExceptions
+rescue LoadError # rubocop:disable Lint/SuppressedException
   # Rails/HttpStatus cannot be loaded if rack/utils is unavailable.
 end