Add latest changes from gitlab-org/gitlab@master

3 files changed, 14 insertions, 2 deletions

diff --git a/spec/factories/gitlab/database/postgres_autovacuum_activity.rb b/spec/factories/gitlab/database/postgres_autovacuum_activity.rb
new file mode 100644
index 00000000000..a770da19a43
--- /dev/null
+++ b/spec/factories/gitlab/database/postgres_autovacuum_activity.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :postgres_autovacuum_activity, class: 'Gitlab::Database::PostgresAutovacuumActivity' do
+    table_identifier { "#{schema}.#{table}" }
+    schema { 'public' }
+    table { 'projects' }
+    vacuum_start { Time.zone.now - 3.minutes }
+  end
+end
diff --git a/spec/factories/project_group_links.rb b/spec/factories/project_group_links.rb
index b1b0f04d84c..84c590e3ea1 100644
--- a/spec/factories/project_group_links.rb
+++ b/spec/factories/project_group_links.rb
@@ -13,7 +13,7 @@ FactoryBot.define do
     trait(:maintainer) { group_access { Gitlab::Access::MAINTAINER } }
 
     after(:create) do |project_group_link, evaluator|
-      project_group_link.group.refresh_members_authorized_projects
+      AuthorizedProjectUpdate::ProjectRecalculateService.new(project_group_link.project).execute
     end
   end
 end
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index 76fa0c4c047..d60512e2b2a 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -98,7 +98,9 @@ FactoryBot.define do
         project.add_owner(project.first_owner)
       end
 
-      project.group&.refresh_members_authorized_projects
+      if project.group
+        AuthorizedProjectUpdate::ProjectRecalculateService.new(project).execute
+      end
 
       # assign the delegated `#ci_cd_settings` attributes after create
       project.group_runners_enabled = evaluator.group_runners_enabled unless evaluator.group_runners_enabled.nil?