diff options
author | Małgorzata Ksionek <mksionek@gitlab.com> | 2019-06-04 11:13:13 +0200 |
---|---|---|
committer | Małgorzata Ksionek <mksionek@gitlab.com> | 2019-06-14 13:26:27 +0200 |
commit | 096b762666e29c432184f00ecdb932cc0f16dbd9 (patch) | |
tree | 053b48bf01133f19eb65bb18de3956853b6188dd | |
parent | 1984287f2f2d5d976803c715e3d7477a3116ff56 (diff) | |
download | gitlab-ce-096b762666e29c432184f00ecdb932cc0f16dbd9.tar.gz |
Add specs for staging stage
Add specs for staging stage and make sure it is finished while counting
-rw-r--r-- | lib/gitlab/cycle_analytics/staging_base_query.rb | 11 | ||||
-rw-r--r-- | lib/gitlab/cycle_analytics/staging_event_fetcher.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/cycle_analytics/staging_stage.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/cycle_analytics/staging_stage_spec.rb | 42 |
4 files changed, 57 insertions, 0 deletions
diff --git a/lib/gitlab/cycle_analytics/staging_base_query.rb b/lib/gitlab/cycle_analytics/staging_base_query.rb new file mode 100644 index 00000000000..49e0ecf11b7 --- /dev/null +++ b/lib/gitlab/cycle_analytics/staging_base_query.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module Gitlab + module CycleAnalytics + module StagingBaseQuery + def stage_query(project_ids) + super(project_ids).where(mr_metrics_table[:first_deployed_to_production_at].not_eq(nil)) + end + end + end +end diff --git a/lib/gitlab/cycle_analytics/staging_event_fetcher.rb b/lib/gitlab/cycle_analytics/staging_event_fetcher.rb index 70ce82383b3..7f55b660e0b 100644 --- a/lib/gitlab/cycle_analytics/staging_event_fetcher.rb +++ b/lib/gitlab/cycle_analytics/staging_event_fetcher.rb @@ -3,6 +3,8 @@ module Gitlab module CycleAnalytics class StagingEventFetcher < BaseEventFetcher + include StagingBaseQuery + def initialize(*args) @projections = [build_table[:id]] @order = build_table[:created_at] diff --git a/lib/gitlab/cycle_analytics/staging_stage.rb b/lib/gitlab/cycle_analytics/staging_stage.rb index dbc2414ff66..10c49e4fb40 100644 --- a/lib/gitlab/cycle_analytics/staging_stage.rb +++ b/lib/gitlab/cycle_analytics/staging_stage.rb @@ -4,6 +4,8 @@ module Gitlab module CycleAnalytics class StagingStage < BaseStage include ProductionHelper + include StagingBaseQuery + def start_time_attrs @start_time_attrs ||= mr_metrics_table[:merged_at] end diff --git a/spec/lib/gitlab/cycle_analytics/staging_stage_spec.rb b/spec/lib/gitlab/cycle_analytics/staging_stage_spec.rb index 8154b3ac701..e4233d44dec 100644 --- a/spec/lib/gitlab/cycle_analytics/staging_stage_spec.rb +++ b/spec/lib/gitlab/cycle_analytics/staging_stage_spec.rb @@ -4,5 +4,47 @@ require 'lib/gitlab/cycle_analytics/shared_stage_spec' describe Gitlab::CycleAnalytics::StagingStage do let(:stage_name) { :staging } + 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(:build_1) { create(:ci_build, project: project) } + let(:build_2) { create(:ci_build, project: project) } + + let(:stage) { described_class.new(project: project, options: { from: 2.days.ago, current_user: project.creator }) } + + before do + mr_1.metrics.update!(merged_at: 80.minutes.ago, first_deployed_to_production_at: 50.minutes.ago, pipeline_id: build_1.commit_id) + mr_2.metrics.update!(merged_at: 60.minutes.ago, first_deployed_to_production_at: 30.minutes.ago, pipeline_id: build_2.commit_id) + mr_3.metrics.update!(merged_at: 10.minutes.ago) + + create(:ci_build, project: project) + 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) + 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(HALF_AN_HOUR_IN_SECONDS) + end + end + + describe '#events' do + it 'exposes builds connected to merge request' do + result = stage.events + + expect(result.count).to eq(2) + expect(result.map { |event| event[:name] }).to contain_exactly(build_1.name, build_2.name) + end + end end |