diff --git a/.haml-lint.yml b/.haml-lint.yml index 94d1e4f0d86..e9cc4a91a21 100644 --- a/.haml-lint.yml +++ b/.haml-lint.yml @@ -93,8 +93,8 @@ linters: - Style/WhileUntilModifier # These cops should eventually get enabled - - Cop/LineBreakAroundConditionalBlock - Cop/LineBreakAfterGuardClauses + - Cop/LineBreakAroundConditionalBlock - Cop/ProjectPathHelper - GitlabSecurity/PublicSend - Layout/EmptyLineAfterGuardClause diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index e9051bd41da..1885c3f5a20 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,41 +1,15 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2019-05-02 07:38:39 -0700 using RuboCop version 0.68.1. +# on 2019-05-04 06:02:16 +0000 using RuboCop version 0.68.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 # versions of RuboCop, may require this file to be generated again. # Offense count: 264 -# Cop supports --auto-correct. Capybara/CurrentPathExpectation: Enabled: false -# Offense count: 979 -# Cop supports --auto-correct. -FactoryBot/AttributeDefinedStatically: - Enabled: false - -# Offense count: 18 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle. -# SupportedStyles: create_list, n_times -FactoryBot/CreateList: - Exclude: - - 'ee/spec/lib/ee/gitlab/auth/ldap/sync/groups_spec.rb' - - 'ee/spec/models/license_spec.rb' - - 'spec/controllers/autocomplete_controller_spec.rb' - - 'spec/features/boards/boards_spec.rb' - - 'spec/features/instance_statistics/cohorts_spec.rb' - - 'spec/features/issuables/issuable_list_spec.rb' - - 'spec/finders/issues_finder_spec.rb' - - 'spec/models/concerns/each_batch_spec.rb' - - 'spec/models/concerns/issuable_spec.rb' - - 'spec/models/project_spec.rb' - - 'spec/models/trending_project_spec.rb' - - 'spec/requests/api/jobs_spec.rb' - - 'spec/requests/api/pipelines_spec.rb' - # Offense count: 1096 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, IndentationWidth. @@ -237,12 +211,6 @@ Lint/ToJSON: - 'lib/gitlab/cycle_analytics/usage_data.rb' - 'lib/gitlab/template/base_template.rb' -# Offense count: 3 -# Cop supports --auto-correct. -Lint/UnneededCopDisableDirective: - Exclude: - - 'spec/factories/project_auto_devops.rb' - # Offense count: 7 Lint/UriEscapeUnescape: Exclude: @@ -313,45 +281,17 @@ Performance/ReverseEach: - 'db/migrate/20190222051615_add_indexes_for_merge_request_diffs_query.rb' - 'lib/gitlab/profiler.rb' -# Offense count: 6 -RSpec/Be: - Exclude: - - 'spec/controllers/projects/pipelines_controller_spec.rb' - - 'spec/models/concerns/issuable_spec.rb' - - 'spec/uploaders/file_uploader_spec.rb' - - 'spec/uploaders/namespace_file_uploader_spec.rb' - # Offense count: 7050 # Configuration parameters: Prefixes. # Prefixes: when, with, without RSpec/ContextWording: Enabled: false -# Offense count: 18 -# Cop supports --auto-correct. -RSpec/EmptyLineAfterExampleGroup: - Exclude: - - 'ee/spec/lib/gitlab/vulnerabilities/container_scanning_vulnerability_spec.rb' - - 'ee/spec/services/ee/issues/create_from_vulnerability_data_service_spec.rb' - - 'spec/controllers/projects/notes_controller_spec.rb' - - 'spec/lib/gitlab/git/diff_collection_spec.rb' - - 'spec/lib/gitlab/git/repository_spec.rb' - - 'spec/lib/gitlab/gitaly_client_spec.rb' - - 'spec/migrations/clean_stage_id_reference_migration_spec.rb' - - 'spec/models/user_spec.rb' - - 'spec/routing/project_routing_spec.rb' - - 'spec/services/projects/overwrite_project_service_spec.rb' - -# Offense count: 406 +# Offense count: 407 # Cop supports --auto-correct. RSpec/EmptyLineAfterFinalLet: Enabled: false -# Offense count: 37 -# Cop supports --auto-correct. -RSpec/EmptyLineAfterHook: - Enabled: false - # Offense count: 232 # Cop supports --auto-correct. RSpec/EmptyLineAfterSubject: @@ -368,18 +308,6 @@ RSpec/ExpectChange: RSpec/ExpectInHook: Enabled: false -# Offense count: 21 -# Cop supports --auto-correct. -RSpec/HooksBeforeExamples: - Enabled: false - -# Offense count: 1498 -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle. -# SupportedStyles: single_line_only, single_statement_only, disallow -RSpec/ImplicitSubject: - Enabled: false - # Offense count: 10 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. @@ -412,11 +340,6 @@ RSpec/LetBeforeExamples: - 'spec/rubocop/cop/migration/update_column_in_batches_spec.rb' - 'spec/serializers/pipeline_details_entity_spec.rb' -# Offense count: 1 -RSpec/MissingExampleGroupArgument: - Exclude: - - 'spec/lib/gitlab/git_access_spec.rb' - # Offense count: 1 # Cop supports --auto-correct. RSpec/MultipleSubjects: @@ -438,25 +361,11 @@ RSpec/OverwritingSetup: RSpec/PredicateMatcher: Enabled: false -# Offense count: 23 -# Cop supports --auto-correct. -RSpec/ReceiveCounts: - Enabled: false - -# Offense count: 5 -# Cop supports --auto-correct. -RSpec/ReceiveNever: - Exclude: - - 'ee/spec/lib/gitlab/elastic/project_search_results_spec.rb' - - 'ee/spec/services/geo/metrics_update_service_spec.rb' - - 'spec/lib/banzai/renderer_spec.rb' - - 'spec/models/concerns/reactive_caching_spec.rb' - # Offense count: 55 RSpec/RepeatedExample: Enabled: false -# Offense count: 479 +# Offense count: 474 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. # SupportedStyles: and_return, block @@ -481,33 +390,6 @@ RSpec/SharedContext: Exclude: - 'spec/features/admin/admin_groups_spec.rb' -# Offense count: 39 -# Cop supports --auto-correct. -RSpec/SharedExamples: - Exclude: - - 'ee/spec/lib/ee/gitlab/auth/ldap/sync/group_spec.rb' - - 'ee/spec/lib/gitlab/email/handler/create_note_handler_spec.rb' - - 'ee/spec/lib/gitlab/email/handler/ee/service_desk_handler_spec.rb' - - 'ee/spec/services/approval_rules/params_filtering_service_spec.rb' - - 'spec/lib/banzai/filter/relative_link_filter_spec.rb' - - 'spec/lib/gitlab/email/handler/create_issue_handler_spec.rb' - - 'spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb' - - 'spec/lib/gitlab/email/handler/create_note_handler_spec.rb' - - 'spec/lib/gitlab/email/handler/unsubscribe_handler_spec.rb' - - 'spec/lib/gitlab/email/receiver_spec.rb' - - 'spec/lib/gitlab/git/tree_spec.rb' - - 'spec/models/project_services/drone_ci_service_spec.rb' - - 'spec/models/user_spec.rb' - - 'spec/support/shared_contexts/email_shared_context.rb' - -# Offense count: 4 -RSpec/UnspecifiedException: - Exclude: - - 'spec/controllers/projects/jobs_controller_spec.rb' - - 'spec/lib/gitlab/background_migration/delete_diff_files_spec.rb' - - 'spec/services/merge_requests/post_merge_service_spec.rb' - - 'spec/workers/delete_diff_files_worker_spec.rb' - # Offense count: 4 RSpec/VoidExpect: Exclude: @@ -543,7 +425,7 @@ Rails/FilePath: Rails/HasManyOrHasOneDependent: Enabled: false -# Offense count: 77 +# Offense count: 40 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle. # SupportedStyles: numeric, symbolic