Add where condition to count in median class
This commit is contained in:
parent
546ee64c47
commit
2ecad462a0
|
@ -158,7 +158,7 @@ module Gitlab
|
|||
Arel::Nodes::Window.new.order(arel_table[column_sym])
|
||||
).as('row_id')
|
||||
|
||||
count = arel_table.project("COUNT(1)").as('ct')
|
||||
count = arel_table.where(arel_table[column_sym].gteq(zero_interval)).project("COUNT(1)").as('ct')
|
||||
|
||||
[column_row, row_id, count]
|
||||
end
|
||||
|
|
|
@ -3,6 +3,40 @@ require 'lib/gitlab/cycle_analytics/shared_stage_spec'
|
|||
|
||||
describe Gitlab::CycleAnalytics::TestStage do
|
||||
let(:stage_name) { :test }
|
||||
let(:project) { create(:project) }
|
||||
let!(:issue_1) { create(:issue, project: project, created_at: 90.minutes.ago) }
|
||||
let!(:issue_2) { create(:issue, project: project, created_at: 60.minutes.ago) }
|
||||
let!(:issue_3) { create(:issue, project: project, created_at: 60.minutes.ago) }
|
||||
let!(:mr_1) { create(:merge_request, :closed, source_project: project, created_at: 60.minutes.ago) }
|
||||
let!(:mr_2) { create(:merge_request, :closed, source_project: project, created_at: 40.minutes.ago, source_branch: 'A') }
|
||||
let!(:mr_3) { create(:merge_request, source_project: project, created_at: 10.minutes.ago, source_branch: 'B') }
|
||||
let!(:mr_4) { create(:merge_request, source_project: project, created_at: 10.minutes.ago, source_branch: 'C') }
|
||||
let!(:mr_5) { create(:merge_request, source_project: project, created_at: 10.minutes.ago, source_branch: 'D') }
|
||||
let(:stage) { described_class.new(project: project, options: { from: 2.days.ago, current_user: project.creator }) }
|
||||
|
||||
before do
|
||||
mr_1.metrics.update!(latest_build_started_at: 32.minutes.ago, latest_build_finished_at: 2.minutes.ago)
|
||||
mr_2.metrics.update!(latest_build_started_at: 62.minutes.ago, latest_build_finished_at: 32.minute.ago)
|
||||
mr_3.metrics.update!(latest_build_started_at: nil, latest_build_finished_at: nil)
|
||||
mr_4.metrics.update!(latest_build_started_at: nil, latest_build_finished_at: nil)
|
||||
mr_5.metrics.update!(latest_build_started_at: nil, latest_build_finished_at: nil)
|
||||
|
||||
create(:merge_requests_closing_issues, merge_request: mr_1, issue: issue_1)
|
||||
create(:merge_requests_closing_issues, merge_request: mr_2, issue: issue_2)
|
||||
create(:merge_requests_closing_issues, merge_request: mr_3, issue: issue_3)
|
||||
create(:merge_requests_closing_issues, merge_request: mr_4, issue: issue_3)
|
||||
create(:merge_requests_closing_issues, merge_request: mr_5, issue: issue_3)
|
||||
end
|
||||
|
||||
it_behaves_like 'base stage'
|
||||
|
||||
describe '#median' do
|
||||
around do |example|
|
||||
Timecop.freeze { example.run }
|
||||
end
|
||||
|
||||
it 'counts median from issues with metrics' do
|
||||
expect(stage.median).to eq(ISSUES_MEDIAN)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue