Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 15 insertions, 1 deletions

diff --git a/spec/lib/gitlab/usage_data_metrics_spec.rb b/spec/lib/gitlab/usage_data_metrics_spec.rb
index ee0cfb1407e..563eed75c38 100644
--- a/spec/lib/gitlab/usage_data_metrics_spec.rb
+++ b/spec/lib/gitlab/usage_data_metrics_spec.rb
@@ -13,7 +13,9 @@ RSpec.describe Gitlab::UsageDataMetrics do
     end
 
     before do
-      allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false)
+      allow_next_instance_of(Gitlab::Database::BatchCounter) do |batch_counter|
+        allow(batch_counter).to receive(:transaction_open?).and_return(false)
+      end
     end
 
     context 'with instrumentation_class' do
@@ -76,4 +78,16 @@ RSpec.describe Gitlab::UsageDataMetrics do
       end
     end
   end
+
+  describe '.suggested_names' do
+    subject { described_class.suggested_names }
+
+    let(:suggested_names) do
+      ::Gitlab::Usage::Metric.all.map(&:with_suggested_name).reduce({}, :deep_merge)
+    end
+
+    it 'includes Service Ping suggested names' do
+      expect(subject).to match_array(suggested_names)
+    end
+  end
 end