diff --git a/.rubocop.yml b/.rubocop.yml index 7d564984d..355a14ac6 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -27,13 +27,13 @@ Style/PercentLiteralDelimiters: Layout/MultilineMethodCallIndentation: EnforcedStyle: indented -Layout/AlignHash: +Layout/HashAlignment: EnforcedColonStyle: table EnforcedHashRocketStyle: table # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth. # SupportedStyles: with_first_parameter, with_fixed_indentation -Layout/AlignParameters: +Layout/ParameterAlignment: EnforcedStyle: with_fixed_indentation diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 48abddc81..0f614a995 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,23 +1,17 @@ # This configuration was generated by -# `rubocop --auto-gen-config --no-offense-counts --no-auto-gen-timestamp` -# using RuboCop version 0.71.0. +# `rubocop --auto-gen-config --no-offense-counts` +# on 2019-12-16 21:01:58 +1300 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. -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, IndentationWidth. -# SupportedStyles: with_first_argument, with_fixed_indentation -Layout/AlignArguments: - Enabled: false - Lint/AmbiguousOperator: Exclude: - 'spec/controllers/crops_controller_spec.rb' # Configuration parameters: AllowComments. -Lint/HandleExceptions: +Lint/SuppressedException: Exclude: - 'lib/tasks/testing.rake' @@ -45,7 +39,7 @@ Rails/CreateTableWithTimestamps: # SupportedStyles: slashes, arguments Rails/FilePath: Exclude: - - 'spec/rails_helper.rb' + - 'app/controllers/crops_controller.rb' # Configuration parameters: Include. # Include: app/models/**/*.rb @@ -63,7 +57,6 @@ Style/ClassAndModuleChildren: Style/CommentedKeyword: Exclude: - - 'lib/tasks/growstuff.rake' - 'spec/models/crop_spec.rb' - 'spec/models/photo_spec.rb' - 'spec/models/planting_spec.rb' @@ -82,4 +75,3 @@ Style/NumericPredicate: - 'spec/**/*' - 'app/helpers/harvests_helper.rb' - 'app/helpers/plantings_helper.rb' - - 'lib/tasks/growstuff.rake'