1 files changed, 32 insertions, 0 deletions
diff --git a/spec/lib/gitlab/usage/metrics/instrumentations/database_metric_spec.rb b/spec/lib/gitlab/usage/metrics/instrumentations/database_metric_spec.rb
index 8e7bd7b84e6..f73155642d6 100644
--- a/spec/lib/gitlab/usage/metrics/instrumentations/database_metric_spec.rb
+++ b/spec/lib/gitlab/usage/metrics/instrumentations/database_metric_spec.rb
@@ -160,6 +160,38 @@ RSpec.describe Gitlab::Usage::Metrics::Instrumentations::DatabaseMetric do
         end
       end
     end
+
+    context 'with custom timestamp column' do
+      subject do
+        described_class.tap do |metric_class|
+          metric_class.relation { Issue }
+          metric_class.operation :count
+          metric_class.timestamp_column :last_edited_at
+        end.new(time_frame: '28d')
+      end
+
+      it 'calculates a correct result' do
+        create(:issue, last_edited_at: 5.days.ago)
+
+        expect(subject.value).to eq(1)
+      end
+    end
+
+    context 'with default timestamp column' do
+      subject do
+        described_class.tap do |metric_class|
+          metric_class.relation { Issue }
+          metric_class.operation :count
+        end.new(time_frame: '28d')
+      end
+
+      it 'calculates a correct result' do
+        create(:issue, last_edited_at: 5.days.ago)
+        create(:issue, created_at: 5.days.ago)
+
+        expect(subject.value).to eq(1)
+      end
+    end
   end
 
   context 'with unimplemented operation method used' do