Add latest changes from gitlab-org/gitlab@master

1 files changed, 18 insertions, 0 deletions

diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index b50481a85cd..7bc9e1a9a32 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -324,6 +324,24 @@ describe Gitlab::UsageData do
         end
       end
 
+      describe '#cycle_analytics_usage_data' do
+        subject { described_class.cycle_analytics_usage_data }
+
+        it 'works when queries time out in new' do
+          allow(Gitlab::CycleAnalytics::UsageData)
+            .to receive(:new).and_raise(ActiveRecord::StatementInvalid.new(''))
+
+          expect { subject }.not_to raise_error
+        end
+
+        it 'works when queries time out in to_json' do
+          allow_any_instance_of(Gitlab::CycleAnalytics::UsageData)
+            .to receive(:to_json).and_raise(ActiveRecord::StatementInvalid.new(''))
+
+          expect { subject }.not_to raise_error
+        end
+      end
+
       describe '#ingress_modsecurity_usage' do
         subject { described_class.ingress_modsecurity_usage }