Merge branch 'afontaine/fix-flaky-ff-test' into 'master'

Adjust Feature Flag Audit Test to be Flexible

See merge request gitlab-org/gitlab!69475

app/services/feature_flags/base_service.rb

@@ -52,8 +52,7 @@ module FeatureFlags
       scopes = strategy.scopes
                  .map { |scope| %Q("#{scope.environment_scope}") }
                  .join(', ')
-      %Q(Created strategy \"#{strategy.name}\" )\
-      "with scopes #{scopes}."
+      %Q(Created strategy "#{strategy.name}" with scopes #{scopes}.)
     end
 
     def feature_flag_by_name

spec/services/feature_flags/create_service_spec.rb

@@ -69,15 +69,10 @@ RSpec.describe FeatureFlags::CreateService do
       end
 
       it 'creates audit event' do
-        expected_message = 'Created feature flag feature_flag '\
-                           'with description "description". '\
-                           'Created strategy "default" with scopes '\
-                           '"*". '\
-                           'Created strategy "default" with scopes '\
-                           '"production".'
-
         expect { subject }.to change { AuditEvent.count }.by(1)
-        expect(AuditEvent.last.details[:custom_message]).to eq(expected_message)
+        expect(AuditEvent.last.details[:custom_message]).to start_with('Created feature flag feature_flag with description "description".')
+        expect(AuditEvent.last.details[:custom_message]).to include('Created strategy "default" with scopes "*".')
+        expect(AuditEvent.last.details[:custom_message]).to include('Created strategy "default" with scopes "production".')
       end
 
       context 'when user is reporter' do