Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 25 insertions, 0 deletions

diff --git a/spec/models/raw_usage_data_spec.rb b/spec/models/raw_usage_data_spec.rb
index 6ff4c6eb19b..95b98279a27 100644
--- a/spec/models/raw_usage_data_spec.rb
+++ b/spec/models/raw_usage_data_spec.rb
@@ -3,6 +3,31 @@
 require 'spec_helper'
 
 RSpec.describe RawUsageData do
+  context 'scopes' do
+    describe '.for_current_reporting_cycle' do
+      subject(:recent_service_ping_reports) { described_class.for_current_reporting_cycle }
+
+      before_all do
+        create(:raw_usage_data, created_at: (described_class::REPORTING_CADENCE + 1.day).ago)
+      end
+
+      it 'returns nil where no records match filter criteria' do
+        expect(recent_service_ping_reports).to be_empty
+      end
+
+      context 'with records matching filtering criteria' do
+        let_it_be(:fresh_record) { create(:raw_usage_data) }
+        let_it_be(:record_at_edge_of_time_range) do
+          create(:raw_usage_data, created_at: described_class::REPORTING_CADENCE.ago)
+        end
+
+        it 'return records within reporting cycle time range ordered by creation time' do
+          expect(recent_service_ping_reports).to eq [fresh_record, record_at_edge_of_time_range]
+        end
+      end
+    end
+  end
+
   describe 'validations' do
     it { is_expected.to validate_presence_of(:payload) }
     it { is_expected.to validate_presence_of(:recorded_at) }