From 54a9633421e68c4a307860998b3e71c9b4aedca1 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2019 20:33:49 +0000 Subject: [PATCH 1/2] Update rubocop-rspec to version 1.36.0 --- Gemfile.lock | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e1f945d0..2285889b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -243,7 +243,7 @@ GEM loggability (~> 0.12) io-like (0.3.0) iso-639 (0.2.8) - jaro_winkler (1.5.2) + jaro_winkler (1.5.3) jquery-datatables-rails (3.4.0) actionpack (>= 3.1) jquery-rails @@ -345,8 +345,8 @@ GEM paper_trail (10.3.0) activerecord (>= 4.2, < 6.1) request_store (~> 1.1) - parallel (1.14.0) - parser (2.6.0.0) + parallel (1.18.0) + parser (2.6.5.0) ast (~> 2.4.0) pdf-core (0.7.0) pdf-inspector (1.3.0) @@ -378,7 +378,6 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - psych (3.1.0) public_suffix (3.1.1) puma (3.12.1) rack (2.0.7) @@ -491,19 +490,18 @@ GEM rspec-mocks (~> 3.6.0) rspec-support (~> 3.6.0) rspec-support (3.6.0) - rubocop (0.66.0) + rubocop (0.75.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.5, != 2.5.1.1) - psych (>= 3.1.0) + parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.6) - rubocop-rspec (1.32.0) - rubocop (>= 0.60.0) + unicode-display_width (>= 1.4.0, < 1.7) + rubocop-rspec (1.36.0) + rubocop (>= 0.68.1) ruby-oembed (0.12.0) ruby-openid (2.5.0) - ruby-progressbar (1.10.0) + ruby-progressbar (1.10.1) ruby-rc4 (0.1.5) ruby_dep (1.5.0) ruby_parser (3.11.0) @@ -583,7 +581,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.5.0) + unicode-display_width (1.6.0) unicode_utils (1.4.0) unobtrusive_flash (3.3.1) railties From 82f42244c026a26efe9cc5a24092075b6a9cd85b Mon Sep 17 00:00:00 2001 From: James Mason Date: Wed, 16 Oct 2019 20:31:36 -0700 Subject: [PATCH 2/2] Update rubocop TODOs based on new version --- .rubocop_todo.yml | 393 ++++++++++------------------------------------ 1 file changed, 87 insertions(+), 306 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 42d0b459..a7514f19 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2019-04-29 14:27:51 +0000 using RuboCop version 0.66.0. +# on 2019-10-16 20:30:53 -0700 using RuboCop version 0.75.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 @@ -63,7 +63,7 @@ Layout/EmptyLineAfterMagicComment: Exclude: - 'spec/models/conference_spec.rb' -# Offense count: 117 +# Offense count: 118 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. # SupportedStyles: empty_lines, no_empty_lines @@ -76,7 +76,7 @@ Layout/EmptyLinesAroundExceptionHandlingKeywords: Exclude: - 'app/models/payment.rb' -# Offense count: 52 +# Offense count: 14 # Cop supports --auto-correct. # Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment. Layout/ExtraSpacing: @@ -91,24 +91,8 @@ Layout/ExtraSpacing: - 'db/migrate/20140623101032_create_ahoy_events.rb' - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb' - 'db/migrate/20140719160903_create_delayed_jobs.rb' - - 'db/schema.rb' - 'spec/models/conference_spec.rb' -# Offense count: 43 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, IndentationWidth. -# SupportedStyles: consistent, consistent_relative_to_receiver, special_for_inner_method_call, special_for_inner_method_call_in_parentheses -Layout/FirstParameterIndentation: - Enabled: false - -# Offense count: 2 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, IndentationWidth. -# SupportedStyles: special_inside_parentheses, consistent, align_brackets -Layout/IndentArray: - Exclude: - - 'app/models/conference.rb' - # Offense count: 5 # Cop supports --auto-correct. # Configuration parameters: IndentationWidth. @@ -117,25 +101,39 @@ Layout/IndentAssignment: - 'app/helpers/format_helper.rb' - 'config/environments/development.rb' +# Offense count: 43 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, IndentationWidth. +# SupportedStyles: consistent, consistent_relative_to_receiver, special_for_inner_method_call, special_for_inner_method_call_in_parentheses +Layout/IndentFirstArgument: + Enabled: false + +# Offense count: 2 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, IndentationWidth. +# SupportedStyles: special_inside_parentheses, consistent, align_brackets +Layout/IndentFirstArrayElement: + Exclude: + - 'app/models/conference.rb' + # Offense count: 4 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, IndentationWidth. # SupportedStyles: special_inside_parentheses, consistent, align_braces -Layout/IndentHash: +Layout/IndentFirstHashElement: Exclude: - 'app/models/user.rb' - 'config/routes.rb' - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb' -# Offense count: 3 +# Offense count: 2 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. -# SupportedStyles: normal, rails +# SupportedStyles: normal, indented_internal_methods Layout/IndentationConsistency: Exclude: - 'app/controllers/users_controller.rb' - 'app/models/event.rb' - - 'spec/controllers/subscriptions_controller_spec.rb' # Offense count: 1 # Cop supports --auto-correct. @@ -146,6 +144,7 @@ Layout/IndentationWidth: # Offense count: 4 # Cop supports --auto-correct. +# Configuration parameters: AllowDoxygenCommentStyle. Layout/LeadingCommentSpace: Exclude: - 'Guardfile' @@ -330,7 +329,7 @@ Layout/SpaceInsidePercentLiteralDelimiters: Exclude: - 'Gemfile' -# Offense count: 2 +# Offense count: 4 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. # SupportedStyles: space, no_space @@ -338,6 +337,13 @@ Layout/SpaceInsideStringInterpolation: Exclude: - 'config/initializers/active_record_log_subscriber.rb' +# Offense count: 1 +# Cop supports --auto-correct. +# Configuration parameters: IndentationWidth. +Layout/Tab: + Exclude: + - 'app/controllers/admin/resources_controller.rb' + # Offense count: 3 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. @@ -372,6 +378,7 @@ Lint/DuplicatedKey: - 'db/migrate/20140801170430_move_event_media_to_commercial.rb' # Offense count: 1 +# Configuration parameters: AllowComments. Lint/HandleExceptions: Exclude: - 'bin/rspec' @@ -389,6 +396,12 @@ Lint/ScriptPermission: - 'Guardfile' - 'Rakefile' +# Offense count: 1 +# Cop supports --auto-correct. +Lint/SendWithMixinArgument: + Exclude: + - 'config/initializers/active_record_log_subscriber.rb' + # Offense count: 1 # Cop supports --auto-correct. # Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments. @@ -403,7 +416,7 @@ Lint/UnusedMethodArgument: Exclude: - 'config/initializers/fuckups.rb' -# Offense count: 136 +# Offense count: 139 Metrics/AbcSize: Max: 70 @@ -414,28 +427,14 @@ Metrics/BlockLength: Max: 1344 # Offense count: 1 -# Configuration parameters: CountBlocks, Max. +# Configuration parameters: CountBlocks. Metrics/BlockNesting: - Exclude: - - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb' + Max: 4 # Offense count: 13 -# Configuration parameters: CountComments, Max. +# Configuration parameters: CountComments. Metrics/ClassLength: - Exclude: - - 'app/controllers/admin/booths_controller.rb' - - 'app/controllers/admin/conferences_controller.rb' - - 'app/controllers/admin/events_controller.rb' - - 'app/controllers/admin/tracks_controller.rb' - - 'app/controllers/proposals_controller.rb' - - 'app/mailers/mailbot.rb' - - 'app/models/ability.rb' - - 'app/models/admin_ability.rb' - - 'app/models/conference.rb' - - 'app/models/event.rb' - - 'app/models/program.rb' - - 'app/models/track.rb' - - 'app/models/user.rb' + Max: 650 # Offense count: 33 Metrics/CyclomaticComplexity: @@ -447,14 +446,9 @@ Metrics/MethodLength: Max: 56 # Offense count: 5 -# Configuration parameters: CountComments, Max. +# Configuration parameters: CountComments. Metrics/ModuleLength: - Exclude: - - 'app/helpers/application_helper.rb' - - 'app/helpers/events_helper.rb' - - 'app/helpers/format_helper.rb' - - 'app/helpers/versions_helper.rb' - - 'spec/support/omniauth_macros.rb' + Max: 173 # Offense count: 22 Metrics/PerceivedComplexity: @@ -486,6 +480,14 @@ Naming/PredicateName: - 'app/models/comment.rb' - 'app/models/contact.rb' +# Offense count: 2 +# Cop supports --auto-correct. +# Configuration parameters: PreferredName. +Naming/RescuedExceptionsVariableName: + Exclude: + - 'app/models/commercial.rb' + - 'app/models/payment.rb' + # Offense count: 2 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames. # AllowedNames: io, id, to, by, on, in, at, ip, db @@ -500,13 +502,6 @@ Naming/VariableNumber: Exclude: - 'spec/models/ticket_purchase_spec.rb' -# Offense count: 4 -# Cop supports --auto-correct. -Performance/InefficientHashSearch: - Exclude: - - 'app/controllers/admin/versions_controller.rb' - - 'app/helpers/versions_helper.rb' - # Offense count: 28 RSpec/AnyInstance: Exclude: @@ -518,13 +513,13 @@ RSpec/AnyInstance: - 'spec/controllers/proposals_controller_spec.rb' - 'spec/controllers/tracks_controller_spec.rb' -# Offense count: 315 +# Offense count: 317 # Configuration parameters: Prefixes. # Prefixes: when, with, without RSpec/ContextWording: Enabled: false -# Offense count: 68 +# Offense count: 73 # Cop supports --auto-correct. # Configuration parameters: SkipBlocks, EnforcedStyle. # SupportedStyles: described_class, explicit @@ -539,6 +534,24 @@ RSpec/DescribedClass: - 'spec/models/ticket_purchase_spec.rb' - 'spec/models/ticket_spec.rb' - 'spec/models/user_spec.rb' + - 'spec/serializers/conference_serializer_spec.rb' + - 'spec/serializers/event_serializer_spec.rb' + - 'spec/serializers/room_serializer_spec.rb' + - 'spec/serializers/speaker_serializer_spec.rb' + - 'spec/serializers/track_serializer_spec.rb' + +# Offense count: 13 +# Cop supports --auto-correct. +# Configuration parameters: AllowConsecutiveOneLiners. +RSpec/EmptyLineAfterExample: + Exclude: + - 'spec/ability/ability_spec.rb' + - 'spec/controllers/admin/comments_controller_spec.rb' + - 'spec/controllers/admin/registration_periods_controller_spec.rb' + - 'spec/controllers/admin/users_controller_spec.rb' + - 'spec/helpers/events_helper_spec.rb' + - 'spec/models/event_spec.rb' + - 'spec/models/survey_spec.rb' # Offense count: 3 # Cop supports --auto-correct. @@ -586,7 +599,7 @@ RSpec/EmptyLineAfterSubject: - 'spec/models/survey_spec.rb' - 'spec/models/track_spec.rb' -# Offense count: 219 +# Offense count: 220 # Configuration parameters: Max. RSpec/ExampleLength: Enabled: false @@ -811,241 +824,6 @@ RSpec/VoidExpect: Exclude: - 'spec/models/conference_spec.rb' -# Offense count: 1 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, Include. -# SupportedStyles: action, filter -# Include: app/controllers/**/*.rb -Rails/ActionFilter: - Exclude: - - 'app/controllers/users/omniauth_callbacks_controller.rb' - -# Offense count: 103 -# Cop supports --auto-correct. -Rails/ActiveRecordAliases: - Enabled: false - -# Offense count: 129 -# Cop supports --auto-correct. -Rails/ApplicationRecord: - Enabled: false - -# Offense count: 10 -# Cop supports --auto-correct. -# Configuration parameters: NilOrEmpty, NotPresent, UnlessPresent. -Rails/Blank: - Exclude: - - 'app/controllers/conferences_controller.rb' - - 'app/controllers/users/omniauth_callbacks_controller.rb' - - 'app/models/program.rb' - - 'app/models/user.rb' - - 'spec/factories/event_schedule.rb' - -# Offense count: 20 -# Configuration parameters: Include. -# Include: db/migrate/*.rb -Rails/CreateTableWithTimestamps: - Enabled: false - -# Offense count: 111 -# Configuration parameters: EnforcedStyle. -# SupportedStyles: strict, flexible -Rails/Date: - Enabled: false - -# Offense count: 3 -# Cop supports --auto-correct. -# Configuration parameters: EnforceForPrefixed. -Rails/Delegate: - Exclude: - - 'app/models/event.rb' - - 'app/models/room.rb' - - 'app/models/track.rb' - -# Offense count: 3 -# Cop supports --auto-correct. -# Configuration parameters: Whitelist. -# Whitelist: find_by_sql -Rails/DynamicFindBy: - Exclude: - - 'app/controllers/admin/events_controller.rb' - - 'db/migrate/20140701123203_add_events_per_week_to_conference.rb' - -# Offense count: 8 -# Configuration parameters: EnforcedStyle. -# SupportedStyles: slashes, arguments -Rails/FilePath: - Exclude: - - 'app/pdfs/ticket_pdf.rb' - - 'config/initializers/active_record_log_subscriber.rb' - - 'config/initializers/carrierwave.rb' - - 'spec/features/lodgings_spec.rb' - - 'spec/features/sponsor_spec.rb' - - 'spec/spec_helper.rb' - -# Offense count: 7 -# Cop supports --auto-correct. -# Configuration parameters: Include. -# Include: app/models/**/*.rb -Rails/FindBy: - Exclude: - - 'app/models/event.rb' - - 'app/models/openid.rb' - - 'app/models/ticket_purchase.rb' - - 'app/models/user.rb' - -# Offense count: 6 -# Configuration parameters: Include. -# Include: app/models/**/*.rb -Rails/HasAndBelongsToMany: - Exclude: - - 'app/models/conference.rb' - - 'app/models/qanswer.rb' - - 'app/models/question.rb' - - 'app/models/registration.rb' - - 'app/models/vchoice.rb' - -# Offense count: 19 -# Configuration parameters: Include. -# Include: app/models/**/*.rb -Rails/HasManyOrHasOneDependent: - Exclude: - - 'app/models/answer.rb' - - 'app/models/event.rb' - - 'app/models/payment.rb' - - 'app/models/physical_ticket.rb' - - 'app/models/question_type.rb' - - 'app/models/registration.rb' - - 'app/models/role.rb' - - 'app/models/room.rb' - - 'app/models/sponsorship_level.rb' - - 'app/models/ticket_purchase.rb' - - 'app/models/track.rb' - - 'app/models/user.rb' - - 'app/models/vday.rb' - - 'app/models/vposition.rb' - -# Offense count: 251 -# Cop supports --auto-correct. -# Configuration parameters: Include. -# Include: spec/**/*, test/**/* -Rails/HttpPositionalArguments: - Enabled: false - -# Offense count: 12 -# Configuration parameters: Include. -# Include: app/models/**/*.rb -Rails/InverseOf: - Exclude: - - 'app/models/booth.rb' - - 'app/models/conference.rb' - - 'app/models/event.rb' - - 'app/models/user.rb' - - 'app/models/venue.rb' - -# Offense count: 1 -# Configuration parameters: Include. -# Include: app/controllers/**/*.rb -Rails/LexicallyScopedActionFilter: - Exclude: - - 'app/controllers/registrations_controller.rb' - -# Offense count: 1 -# Cop supports --auto-correct. -Rails/LinkToBlank: - Exclude: - - 'app/helpers/format_helper.rb' - -# Offense count: 1 -# Configuration parameters: Include. -# Include: app/**/*.rb, config/**/*.rb, db/**/*.rb, lib/**/*.rb -Rails/Output: - Exclude: - - 'config/environment.rb' - -# Offense count: 4 -Rails/OutputSafety: - Exclude: - - 'app/helpers/events_helper.rb' - - 'app/helpers/format_helper.rb' - - 'app/models/commercial.rb' - -# Offense count: 15 -# Cop supports --auto-correct. -Rails/PluralizationGrammar: - Exclude: - - 'spec/models/conference_spec.rb' - -# Offense count: 3 -# Cop supports --auto-correct. -Rails/Presence: - Exclude: - - 'app/controllers/schedules_controller.rb' - - 'app/helpers/application_helper.rb' - - 'app/models/user.rb' - -# Offense count: 18 -# Cop supports --auto-correct. -# Configuration parameters: NotNilAndNotEmpty, NotBlank, UnlessBlank. -Rails/Present: - Exclude: - - 'app/helpers/users_helper.rb' - - 'app/models/cfp.rb' - - 'app/models/email_settings.rb' - - 'app/models/event.rb' - - 'app/models/program.rb' - - 'app/models/venue.rb' - - 'config/routes.rb' - -# Offense count: 52 -# Configuration parameters: Include. -# Include: db/migrate/*.rb -Rails/ReversibleMigration: - Exclude: - - 'db/migrate/20140530082708_remove_color_defaults.rb' - - 'db/migrate/20140605125153_update_event_states.rb' - - 'db/migrate/20140610173021_change_person_id_to_user_id_in_registrations.rb' - - 'db/migrate/20140611123926_change_person_id_to_user_id_in_votes.rb' - - 'db/migrate/20140623150541_drop_person_and_event_person_tables.rb' - - 'db/migrate/20140731165107_move_conference_contact_details_to_contact.rb' - - 'db/migrate/20140801164901_move_conference_media_to_commercial.rb' - - 'db/migrate/20140801170430_move_event_media_to_commercial.rb' - - 'db/migrate/20140820093735_migrating_supporter_registrations_to_ticket_users.rb' - - 'db/migrate/20140821103643_split_ticket_price_in_price_and_currency.rb' - - 'db/migrate/20140825093132_move_splashpage_attributes_from_conference_to_splashpage.rb' - - 'db/migrate/20140930092923_move_sponsor_email_to_contact.rb' - - 'db/migrate/20141117222919_drop_splash_descriptions_and_photo.rb' - - 'db/migrate/20141130182139_drop_table_event_attachments.rb' - -# Offense count: 8 -# Configuration parameters: Blacklist, Whitelist. -# Blacklist: decrement!, decrement_counter, increment!, increment_counter, toggle!, touch, update_all, update_attribute, update_column, update_columns, update_counters -Rails/SkipsModelValidations: - Exclude: - - 'app/models/concerns/revision_count.rb' - - 'db/migrate/20140730104658_migrate_roles_for_cancancan.rb' - - 'db/migrate/20161229080315_add_comments_count_to_events.rb' - - 'db/migrate/20180226032958_add_created_at_and_updated_at_to_event_types.rb' - - 'db/migrate/20180313012253_add_timestamps_to_tickets.rb' - - 'lib/tasks/user.rake' - - 'spec/controllers/conferences_controller_spec.rb' - -# Offense count: 48 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle. -# SupportedStyles: strict, flexible -Rails/TimeZone: - Exclude: - - 'app/models/comment.rb' - - 'app/models/conference.rb' - - 'config/environments/test.rb' - - 'db/migrate/20180226032958_add_created_at_and_updated_at_to_event_types.rb' - - 'db/migrate/20180313012253_add_timestamps_to_tickets.rb' - - 'lib/tasks/dump_db.rake' - - 'spec/controllers/admin/comments_controller_spec.rb' - - 'spec/factories/users.rb' - - 'spec/models/conference_spec.rb' - # Offense count: 3 Security/Open: Exclude: @@ -1141,10 +919,17 @@ Style/ExpandPathArguments: - 'config/environment.rb' - 'spec/spec_helper.rb' +# Offense count: 1 +# Configuration parameters: EnforcedStyle. +# SupportedStyles: annotated, template, unannotated +Style/FormatStringToken: + Exclude: + - 'app/uploaders/picture_uploader.rb' + # Offense count: 49 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. -# SupportedStyles: when_needed, always, never +# SupportedStyles: always, never Style/FrozenStringLiteralComment: Enabled: false @@ -1246,14 +1031,9 @@ Style/NumericLiteralPrefix: # Offense count: 8 # Cop supports --auto-correct. -# Configuration parameters: MinDigits, Strict. +# Configuration parameters: Strict. Style/NumericLiterals: - Exclude: - - 'db/migrate/20140820124117_undo_wrong_migration20140801080705_add_users_to_events.rb' - - 'db/schema.rb' - - 'lib/tasks/events_registrations.rake' - - 'spec/features/versions_spec.rb' - - 'spec/models/ticket_spec.rb' + MinDigits: 15 # Offense count: 36 # Cop supports --auto-correct. @@ -1451,7 +1231,7 @@ Style/UnneededCondition: - 'app/helpers/versions_helper.rb' - 'app/models/ticket.rb' -# Offense count: 7 +# Offense count: 9 # Cop supports --auto-correct. # Configuration parameters: WordRegex. # SupportedStyles: percent, brackets @@ -1459,8 +1239,9 @@ Style/WordArray: EnforcedStyle: percent MinSize: 8 -# Offense count: 2864 -# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. +# Offense count: 2915 +# Cop supports --auto-correct. +# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. # URISchemes: http, https Metrics/LineLength: Max: 619