From 2e6890884061b66332beebbe127c139d447777a1 Mon Sep 17 00:00:00 2001 From: Sashi Kumar Kumaresan Date: Wed, 22 Oct 2025 16:09:45 +0200 Subject: [PATCH] Fix flaky test in PersistPolicyService spec --- .../persist_policy_service_spec.rb | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/ee/spec/services/security/security_orchestration_policies/persist_policy_service_spec.rb b/ee/spec/services/security/security_orchestration_policies/persist_policy_service_spec.rb index 733fbb915b2dd7..baa707996c12f6 100644 --- a/ee/spec/services/security/security_orchestration_policies/persist_policy_service_spec.rb +++ b/ee/spec/services/security/security_orchestration_policies/persist_policy_service_spec.rb @@ -101,11 +101,18 @@ def persist_with_force_resync! persist end - it 'calls EventPublisher with created policies', - quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/545645' do + it 'calls EventPublisher with created policies' do expect(Security::SecurityOrchestrationPolicies::EventPublisher).to receive(:new).with({ - db_policies: policy_configuration.security_policies.reload.type_approval_policy.undeleted, - created_policies: policy_configuration.security_policies.reload.type_approval_policy, + db_policies: contain_exactly( + have_attributes(name: scan_finding_policy[:name]), + have_attributes(name: license_finding_policy[:name]), + have_attributes(name: any_merge_request_policy[:name]) + ), + created_policies: contain_exactly( + have_attributes(name: scan_finding_policy[:name]), + have_attributes(name: license_finding_policy[:name]), + have_attributes(name: any_merge_request_policy[:name]) + ), policies_changes: [], deleted_policies: [], force_resync: false @@ -334,7 +341,9 @@ def persist_with_force_resync! it 'calls EventPublisher with deleted policies' do expect(Security::SecurityOrchestrationPolicies::EventPublisher).to receive(:new).with({ - db_policies: policy_configuration.security_policies.reload.type_approval_policy.undeleted, + db_policies: contain_exactly( + have_attributes(name: license_finding_policy[:name]) + ), created_policies: [], policies_changes: [], deleted_policies: [Security::Policy.first], @@ -358,7 +367,9 @@ def persist_with_force_resync! it 'calls EventPublisher with force_resync set to true' do expect(Security::SecurityOrchestrationPolicies::EventPublisher).to receive(:new).with({ - db_policies: policy_configuration.security_policies.reload.type_approval_policy.undeleted, + db_policies: contain_exactly( + have_attributes(name: license_finding_policy[:name]) + ), created_policies: [], policies_changes: [], deleted_policies: [Security::Policy.first], @@ -454,7 +465,9 @@ def persist_with_force_resync! it 'calls EventPublisher with deleted policies' do expect(Security::SecurityOrchestrationPolicies::EventPublisher).to receive(:new).with({ - db_policies: policy_configuration.security_policies.reload.type_approval_policy.undeleted, + db_policies: contain_exactly( + have_attributes(name: policy_before[:name]) + ), created_policies: [], policies_changes: [an_instance_of(Security::SecurityOrchestrationPolicies::PolicyComparer)], deleted_policies: [], @@ -478,7 +491,9 @@ def persist_with_force_resync! it 'calls EventPublisher with force_resync set to true' do expect(Security::SecurityOrchestrationPolicies::EventPublisher).to receive(:new).with({ - db_policies: policy_configuration.security_policies.reload.type_approval_policy.undeleted, + db_policies: contain_exactly( + have_attributes(name: policy_before[:name]) + ), created_policies: [], policies_changes: [an_instance_of(Security::SecurityOrchestrationPolicies::PolicyComparer)], deleted_policies: [], -- GitLab