diff --git a/spec/tooling/danger/project_helper_spec.rb b/spec/tooling/danger/project_helper_spec.rb index 4eff248a6f01331c96a21c2d09af8dd3ff14406f..90409ff55597908e3cd39144f511c58cf1053911 100644 --- a/spec/tooling/danger/project_helper_spec.rb +++ b/spec/tooling/danger/project_helper_spec.rb @@ -252,6 +252,8 @@ [:backend, :analytics_instrumentation] | '+ foo_count(User.active)' | ['lib/gitlab/usage_data.rb'] [:backend] | '+ count(User.active)' | ['user.rb'] [:database, :backend] | '+ User.upsert({ name: "blah" })' | ['app/foo/bar.rb'] + [:database, :backend] | '+ User.upsert(' | ['app/foo/bar.rb'] + [:database, :backend] | '+ Organizations::OrganizationUser.upsert({' | ['app/foo/bar.rb'] [:database, :backend] | '+ upsert({ name: "blah" })' | ['app/foo/bar.rb'] [:database, :backend] | '+ .upsert({ name: "blah" })' | ['app/foo/bar.rb'] [:database, :backend] | '+ .delete_all' | ['app/foo/bar.rb'] diff --git a/tooling/danger/project_helper.rb b/tooling/danger/project_helper.rb index 633516591a8e0c04886b7923841cd82376ae859e..bf2dba640659039edaae5080f8f07f09cb4c54db 100644 --- a/tooling/danger/project_helper.rb +++ b/tooling/danger/project_helper.rb @@ -105,7 +105,7 @@ module ProjectHelper %r{\A(app/models/project_authorization|app/services/users/refresh_authorized_projects_service)(/|\.rb)} => [:database, :backend], %r{\A((ee|jh)/)?app/finders/} => [:database, :backend], %r{\Arubocop/cop/migration(/|\.rb)} => :database, - [%r{\A((ee|jh)/)?(app|lib)/.+\.rb}, %r{\A\+\s+(\w*\.)?(update_all|upsert|upsert_all|delete_all|destroy_all)(\(.*\))?\s*\z}] => [:database, :backend], + [%r{\A((ee|jh)/)?(app|lib)/.+\.rb}, %r{\A\+\s+(\S*\.)?(update_all|upsert|upsert_all|delete_all|destroy_all)(\(.*\)|\(|\(.*)?\s*\z}] => [:database, :backend], %r{\Alib/gitlab/ci/templates} => :ci_template,