Merge pull request #586 from sanger/fix-rubocop-rails

Update Gemfile.lock and lib/resource_tools/json.rb

Gemfile.lock

@@ -39,7 +39,7 @@ GEM
       amq-protocol (~> 2.3, >= 2.3.1)
       sorted_set (~> 1, >= 1.0.2)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.2.5)
     crass (1.0.6)
     diff-lcs (1.5.0)
@@ -84,7 +84,7 @@ GEM
     lumberjack (1.2.9)
     method_source (1.0.0)
     mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    minitest (5.21.2)
     msgpack (1.5.2)
     multi_json (1.15.0)
     mysql2 (0.5.5)
@@ -96,7 +96,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.24.0)
-    parser (3.3.0.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
@@ -126,7 +126,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbtree (0.4.4)
-    regexp_parser (2.8.3)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -149,11 +149,11 @@ GEM
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
     rspec-support (3.12.1)
-    rubocop (1.59.0)
+    rubocop (1.60.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
@@ -173,9 +173,9 @@ GEM
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rspec (2.26.1)
       rubocop (~> 1.40)
-      rubocop-ast (>= 1.30.0, < 2.0)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)

lib/resource_tools/json.rb

@@ -146,7 +146,7 @@ def custom_value(name, &block)
       end
     end
 
-    # rubocop:disable Naming/BlockForwarding
+    # rubocop:disable Style/ArgumentsForwarding
     def initialize(*args, &block)
       super
       if self.class.custom_values.present?
@@ -157,7 +157,7 @@ def initialize(*args, &block)
       convert_booleans
       delete_if { |k, _| ignoreable.include?(k) }
     end
-    # rubocop:enable Naming/BlockForwarding
+    # rubocop:enable Style/ArgumentsForwarding
 
     def convert_booleans
       self.stored_as_boolean.each do |key|