Merge pull request #385 from ZeroPointEnergy/rails_5.2.2_updates

Rails 5.2.2 updates

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-08-27 17:05:32 +0200 using RuboCop version 0.58.2.
+# on 2019-01-30 10:50:33 +0100 using RuboCop version 0.63.1.
 # 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
@@ -22,7 +22,7 @@ Layout/ElseAlignment:
   Exclude:
     - 'lib/node_group_graph.rb'
 
-# Offense count: 39
+# Offense count: 38
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, no_empty_lines
@@ -60,13 +60,12 @@ Layout/EmptyLinesAroundModuleBody:
     - 'lib/puppet/report_sanitizer.rb'
     - 'spec/support/describe_reports.rb'
 
-# Offense count: 4
+# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleAlignWith, AutoCorrect, Severity.
 # SupportedStylesAlignWith: keyword, variable, start_of_line
 Layout/EndAlignment:
   Exclude:
-    - 'config/initializers/01_serialize_flash_as_hash.rb'
     - 'lib/node_group_graph.rb'
     - 'lib/report_transformer.rb'
 
@@ -79,25 +78,24 @@ Layout/IndentationConsistency:
     - 'spec/helpers/application_helper_spec.rb'
     - 'spec/lib/puppet/report_sanitizer_spec.rb'
 
-# Offense count: 22
+# Offense count: 23
 # Cop supports --auto-correct.
 # Configuration parameters: Width, IgnoredPatterns.
 Layout/IndentationWidth:
   Enabled: false
 
-# Offense count: 17
+# Offense count: 15
 # Cop supports --auto-correct.
 Layout/LeadingCommentSpace:
   Exclude:
-    - 'config/initializers/safe_yaml.rb'
     - 'lib/node_group_graph.rb'
     - 'lib/tasks/classesgroups.rake'
     - 'spec/helpers/pages_helper_spec.rb'
     - 'spec/helpers/status_helper_spec.rb'
     - 'spec/models/report_spec.rb'
     - 'spec/spec_helper.rb'
 
-# Offense count: 96
+# Offense count: 95
 # Cop supports --auto-correct.
 Layout/SpaceAfterComma:
   Enabled: false
@@ -144,7 +142,7 @@ Layout/SpaceAroundOperators:
     - 'spec/models/report_spec.rb'
     - 'spec/models/resource_status_spec.rb'
 
-# Offense count: 55
+# Offense count: 54
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
 # SupportedStyles: space, no_space
@@ -159,23 +157,23 @@ Layout/SpaceBeforeComma:
     - 'app/helpers/application_helper.rb'
     - 'spec/models/report_spec.rb'
 
-# Offense count: 217
+# Offense count: 212
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceInsideBlockBraces:
   Enabled: false
 
-# Offense count: 199
+# Offense count: 195
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
 # SupportedStyles: space, no_space, compact
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceInsideHashLiteralBraces:
   Enabled: false
 
-# Offense count: 34
+# Offense count: 33
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: space, no_space
@@ -185,22 +183,19 @@ Layout/SpaceInsideParens:
     - 'app/helpers/paginate_scope_helper.rb'
     - 'app/helpers/reports_helper.rb'
     - 'app/models/report.rb'
-    - 'config/initializers/check_migration_version.rb'
     - 'lib/registry.rb'
     - 'lib/tasks/install.rake'
     - 'spec/controllers/nodes_controller_spec.rb'
     - 'spec/helpers/application_helper_spec.rb'
     - 'spec/models/report_spec.rb'
 
-# Offense count: 12
+# Offense count: 10
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: final_newline, final_blank_line
 Layout/TrailingBlankLines:
   Exclude:
     - 'app/helpers/conflict_html.rb'
-    - 'config/initializers/check_migration_version.rb'
-    - 'config/initializers/time_formats.rb'
     - 'lib/progress_bar.rb'
     - 'lib/tasks/rake_helpers.rb'
     - 'lib/tasks/schematize_reports.rake'
@@ -211,17 +206,43 @@ Layout/TrailingBlankLines:
     - 'spec/shared_behaviors/controller_search.rb'
     - 'spec/support/should_matchers.rb'
 
-# Offense count: 12
+# Offense count: 11
 # Cop supports --auto-correct.
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
   Exclude:
     - 'app/helpers/conflict_analyzer.rb'
-    - 'config/initializers/check_migration_version.rb'
     - 'lib/node_group_graph.rb'
     - 'lib/tasks/install.rake'
     - 'spec/shared_behaviors/restful_routing_behavior.rb'
 
+# Offense count: 7
+# Cop supports --auto-correct.
+Lint/DeprecatedClassMethods:
+  Exclude:
+    - 'lib/puppet_https.rb'
+    - 'lib/tasks/import_reports.rake'
+    - 'lib/tasks/install.rake'
+    - 'lib/tasks/plugins.rake'
+
+# Offense count: 8
+Lint/ShadowingOuterLocalVariable:
+  Exclude:
+    - 'app/controllers/node_groups_controller.rb'
+    - 'spec/factories.rb'
+
+# Offense count: 24
+Lint/UselessAssignment:
+  Exclude:
+    - 'app/controllers/nodes_controller.rb'
+    - 'app/helpers/application_helper.rb'
+    - 'app/helpers/conflict_html.rb'
+    - 'lib/progress_bar.rb'
+    - 'spec/controllers/nodes_controller_spec.rb'
+    - 'spec/helpers/application_helper_spec.rb'
+    - 'spec/lib/report_transformer_spec.rb'
+    - 'spec/models/report_spec.rb'
+
 # Offense count: 25
 # Cop supports --auto-correct.
 # Configuration parameters: MaxKeyValuePairs.
@@ -230,7 +251,7 @@ Performance/RedundantMerge:
     - 'spec/controllers/node_groups_controller_spec.rb'
     - 'spec/controllers/nodes_controller_spec.rb'
 
-# Offense count: 28
+# Offense count: 26
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, conditionals
@@ -240,7 +261,6 @@ Style/AndOr:
     - 'app/helpers/reports_helper.rb'
     - 'app/models/node.rb'
     - 'app/models/report.rb'
-    - 'config/initializers/check_migration_version.rb'
     - 'lib/data_generator.rb'
     - 'lib/find_from_form.rb'
     - 'lib/node_group_graph.rb'
@@ -279,14 +299,14 @@ Style/DefWithParentheses:
   Exclude:
     - 'lib/puppet/report_sanitizer.rb'
 
-# Offense count: 194
+# Offense count: 156
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: when_needed, always, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 1199
+# Offense count: 1196
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
@@ -301,7 +321,15 @@ Style/MethodDefParentheses:
   Exclude:
     - 'lib/trimmer.rb'
 
-# Offense count: 20
+# Offense count: 3
+# Cop supports --auto-correct.
+Style/RedundantBegin:
+  Exclude:
+    - 'app/controllers/nodes_controller.rb'
+    - 'app/controllers/reports_controller.rb'
+    - 'app/models/resource_event.rb'
+
+# Offense count: 18
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:
@@ -311,7 +339,6 @@ Style/RedundantReturn:
     - 'app/models/node.rb'
     - 'app/models/report.rb'
     - 'app/models/status.rb'
-    - 'config/initializers/app_version_init.rb'
     - 'lib/settings_reader.rb'
     - 'lib/tasks/db_raw.rake'
     - 'lib/tasks/install.rake'
@@ -329,7 +356,7 @@ Style/Semicolon:
     - 'lib/node_group_graph.rb'
     - 'lib/progress_bar.rb'
 
-# Offense count: 2052
+# Offense count: 1974
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
@@ -349,9 +376,3 @@ Style/TrivialAccessors:
 Style/UnneededPercentQ:
   Exclude:
     - 'spec/controllers/nodes_controller_spec.rb'
-
-# Offense count: 945
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 275