diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml index 510943784141a0c5a50fb86c3ac7f8f3f6552521..57320ca4c6c5cd545e106fe079aebd5f73350ca1 100644 --- a/.rubocop_todo/rspec/context_wording.yml +++ b/.rubocop_todo/rspec/context_wording.yml @@ -2960,7 +2960,6 @@ RSpec/ContextWording: - 'spec/tasks/gitlab/packages/migrate_rake_spec.rb' - 'spec/tasks/gitlab/terraform/migrate_rake_spec.rb' - 'spec/tasks/gitlab/workhorse_rake_spec.rb' - - 'spec/tooling/danger/project_helper_spec.rb' - 'spec/tooling/lib/tooling/parallel_rspec_runner_spec.rb' - 'spec/uploaders/attachment_uploader_spec.rb' - 'spec/uploaders/avatar_uploader_spec.rb' diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml index ad42026a07936cd6e9cfc0f7639e56e11f3addf9..321aa0befdd3fb38194848773d8b57828a133d08 100644 --- a/.rubocop_todo/rspec/feature_category.yml +++ b/.rubocop_todo/rspec/feature_category.yml @@ -5285,7 +5285,6 @@ RSpec/FeatureCategory: - 'spec/tooling/danger/datateam_spec.rb' - 'spec/tooling/danger/feature_flag_spec.rb' - 'spec/tooling/danger/analytics_instrumentation_spec.rb' - - 'spec/tooling/danger/project_helper_spec.rb' - 'spec/tooling/danger/sidekiq_queues_spec.rb' - 'spec/tooling/docs/deprecation_handling_spec.rb' - 'spec/tooling/graphql/docs/renderer_spec.rb' diff --git a/spec/tooling/danger/project_helper_spec.rb b/spec/tooling/danger/project_helper_spec.rb index 2da90ddbd67851e9c474bedfd24924f3788dfabe..a41aba17f56700231c4db3d4fa5736117d654151 100644 --- a/spec/tooling/danger/project_helper_spec.rb +++ b/spec/tooling/danger/project_helper_spec.rb @@ -8,7 +8,7 @@ require_relative '../../../danger/plugins/project_helper' -RSpec.describe Tooling::Danger::ProjectHelper do +RSpec.describe Tooling::Danger::ProjectHelper, feature_category: :tooling do include StubENV include_context "with dangerfile" @@ -130,6 +130,7 @@ 'lib/gitlab/background_migration.rb' | [:database, :backend] 'lib/gitlab/background_migration/foo' | [:database, :backend] 'ee/lib/gitlab/background_migration/foo' | [:database, :backend] + 'ee/lib/ee/gitlab/background_migration/foo' | [:database, :backend] 'lib/gitlab/database.rb' | [:database, :backend] 'lib/gitlab/database/foo' | [:database, :backend] 'ee/lib/gitlab/database/foo' | [:database, :backend] @@ -238,7 +239,7 @@ it { is_expected.to eq(expected_categories) } end - context 'having specific changes' do + context 'when having specific changes' do where(:expected_categories, :patch, :changed_files) do [:analytics_instrumentation] | '+data-track-action' | ['components/welcome.vue'] [:analytics_instrumentation] | '+ data: { track_label:' | ['admin/groups/_form.html.haml'] diff --git a/tooling/danger/project_helper.rb b/tooling/danger/project_helper.rb index 2b781b58a6477f5d9b6ed93b335a3a3d47ca0b54..e0953d59dad64148675e041b2afcfd418f6eb498 100644 --- a/tooling/danger/project_helper.rb +++ b/tooling/danger/project_helper.rb @@ -100,7 +100,7 @@ module ProjectHelper %r{\A((ee|jh)/)?db/(geo/)?(?!click_house|fixtures)[^/]+} => [:database], %r{\A((ee|jh)/)?db/[^/]+\z} => [:database], # db/ root files - %r{\A((ee|jh)/)?lib/gitlab/(database|background_migration|sql)(/|\.rb)} => [:database, :backend], + %r{\A((ee|jh)/)?lib/(ee/)?gitlab/(database|background_migration|sql)(/|\.rb)} => [:database, :backend], %r{\A(app/services/authorized_project_update/find_records_due_for_refresh_service)(/|\.rb)} => [:database, :backend], %r{\A(app/models/project_authorization|app/services/users/refresh_authorized_projects_service)(/|\.rb)} => [:database, :backend], %r{\A((ee|jh)/)?app/finders/} => [:database, :backend],