1 files changed, 10 insertions, 2 deletions
diff --git a/spec/lib/gitlab/usage/metrics/instrumentations/count_users_creating_issues_metric_spec.rb b/spec/lib/gitlab/usage/metrics/instrumentations/count_users_creating_issues_metric_spec.rb
index 9f4686ab6cd..3fb4c3a4e3f 100644
--- a/spec/lib/gitlab/usage/metrics/instrumentations/count_users_creating_issues_metric_spec.rb
+++ b/spec/lib/gitlab/usage/metrics/instrumentations/count_users_creating_issues_metric_spec.rb
@@ -8,10 +8,18 @@ RSpec.describe Gitlab::Usage::Metrics::Instrumentations::CountUsersCreatingIssue
   let_it_be(:old_issue) { create(:issue, author: author, created_at: 2.months.ago) }
 
   context 'with all time frame' do
-    it_behaves_like 'a correct instrumented metric value', { time_frame: 'all', data_source: 'database' }, 1
+    let(:expected_value) { 1 }
+    let(:expected_query) { 'SELECT COUNT(DISTINCT "issues"."author_id") FROM "issues"' }
+
+    it_behaves_like 'a correct instrumented metric value and query', { time_frame: 'all' }
   end
 
   context 'for 28d time frame' do
-    it_behaves_like 'a correct instrumented metric value', { time_frame: '28d', data_source: 'database' }, 1
+    let(:expected_value) { 1 }
+    let(:start) { 30.days.ago.to_s(:db) }
+    let(:finish) { 2.days.ago.to_s(:db) }
+    let(:expected_query) { "SELECT COUNT(DISTINCT \"issues\".\"author_id\") FROM \"issues\" WHERE \"issues\".\"created_at\" BETWEEN '#{start}' AND '#{finish}'" }
+
+    it_behaves_like 'a correct instrumented metric value and query', { time_frame: '28d' }
   end
 end