diff options
author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-02-15 13:23:39 +0000 |
---|---|---|
committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-02-28 10:46:20 +0000 |
commit | 335ee79a73fafdf00fac6e8ffc286ce4bad273ff (patch) | |
tree | d30033fd007c992448ce02f42e46f9da48e223cb /spec | |
parent | 3f31da9c69c550d1698a1376e37d36f4e6e309b5 (diff) | |
download | gitlab-ce-335ee79a73fafdf00fac6e8ffc286ce4bad273ff.tar.gz |
Refactors median code to work with both single and multiple projects
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/cycle_analytics_spec.rb | 14 | ||||
-rw-r--r-- | spec/lib/gitlab/cycle_analytics/usage_data_spec.rb | 36 | ||||
-rw-r--r-- | spec/lib/gitlab/database/median_spec.rb | 15 | ||||
-rw-r--r-- | spec/models/cycle_analytics_spec.rb | 30 | ||||
-rw-r--r-- | spec/support/cycle_analytics_helpers.rb | 12 | ||||
-rw-r--r-- | spec/support/cycle_analytics_helpers/test_generation.rb | 2 |
6 files changed, 96 insertions, 13 deletions
diff --git a/spec/features/cycle_analytics_spec.rb b/spec/features/cycle_analytics_spec.rb index 510677ecf56..ce7c0cac9d8 100644 --- a/spec/features/cycle_analytics_spec.rb +++ b/spec/features/cycle_analytics_spec.rb @@ -41,7 +41,7 @@ feature 'Cycle Analytics', :js do allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return([issue]) project.add_master(user) - create_cycle + @build = create_cycle(user, project, issue, mr, milestone, pipeline) deploy_master sign_in(user) @@ -117,7 +117,7 @@ feature 'Cycle Analytics', :js do project.add_guest(guest) allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return([issue]) - create_cycle + create_cycle(user, project, issue, mr, milestone, pipeline) deploy_master sign_in(guest) @@ -166,16 +166,6 @@ feature 'Cycle Analytics', :js do expect(find('.stage-events')).to have_content("!#{mr.iid}") end - def create_cycle - issue.update(milestone: milestone) - pipeline.run - - @build = create(:ci_build, pipeline: pipeline, status: :success, author: user) - - merge_merge_requests_closing_issue(issue) - ProcessCommitWorker.new.perform(project.id, user.id, mr.commits.last.to_hash) - end - def click_stage(stage_name) find('.stage-nav li', text: stage_name).click wait_for_requests diff --git a/spec/lib/gitlab/cycle_analytics/usage_data_spec.rb b/spec/lib/gitlab/cycle_analytics/usage_data_spec.rb new file mode 100644 index 00000000000..4815e91665a --- /dev/null +++ b/spec/lib/gitlab/cycle_analytics/usage_data_spec.rb @@ -0,0 +1,36 @@ +require 'spec_helper' + +describe Gitlab::CycleAnalytics::UsageData do + let(:project) { create(:project, :repository) } + let(:user) { create(:user, :admin) } + let(:issue) { create(:issue, project: project, created_at: 2.days.ago) } + let(:milestone) { create(:milestone, project: project) } + let(:mr) { create_merge_request_closing_issue(issue, commit_message: "References #{issue.to_reference}") } + let(:pipeline) { create(:ci_empty_pipeline, status: 'created', project: project, ref: mr.source_branch, sha: mr.source_branch_sha, head_pipeline_of: mr) } + + subject { described_class.new([project]) } + + describe '#to_json' do + before do + allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return([issue]) + + create_cycle(user, project, issue, mr, milestone, pipeline) + deploy_master + end + + it 'returns the aggregated usage data of every selected project' do + result = subject.to_json + avg_cycle_analytics = result[:avg_cycle_analytics] + + expect(result).to have_key(:avg_cycle_analytics) + CycleAnalytics::STAGES.each do |stage_name| + stage_values = avg_cycle_analytics[stage_name] + + expect(avg_cycle_analytics).to have_key(stage_name) + expect(stage_values).to have_key(:average) + expect(stage_values).to have_key(:sd) + expect(stage_values).to have_key(:missing) + end + end + end +end diff --git a/spec/lib/gitlab/database/median_spec.rb b/spec/lib/gitlab/database/median_spec.rb new file mode 100644 index 00000000000..36718a1f47b --- /dev/null +++ b/spec/lib/gitlab/database/median_spec.rb @@ -0,0 +1,15 @@ +require 'spec_helper' + +describe Gitlab::Database::Median do + describe '#extract_medians' do + context 'when using MySQL' do + it 'returns an empty hash' do + values = [["1", "1000"]] + + allow(Gitlab::Database).to receive(:mysql?).and_return(true) + + expect(described_class.new.extract_median(values)).eq({}) + end + end + end +end diff --git a/spec/models/cycle_analytics_spec.rb b/spec/models/cycle_analytics_spec.rb new file mode 100644 index 00000000000..bbb91a4aae5 --- /dev/null +++ b/spec/models/cycle_analytics_spec.rb @@ -0,0 +1,30 @@ +require 'spec_helper' + +describe CycleAnalytics do + let(:project) { create(:project, :repository) } + let(:from_date) { 10.days.ago } + let(:user) { create(:user, :admin) } + let(:issue) { create(:issue, project: project, created_at: 2.days.ago) } + let(:milestone) { create(:milestone, project: project) } + let(:mr) { create_merge_request_closing_issue(issue, commit_message: "References #{issue.to_reference}") } + let(:pipeline) { create(:ci_empty_pipeline, status: 'created', project: project, ref: mr.source_branch, sha: mr.source_branch_sha, head_pipeline_of: mr) } + + subject { described_class.new(project, from: from_date) } + + describe '#all_medians_per_stage' do + before do + allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return([issue]) + + create_cycle(user, project, issue, mr, milestone, pipeline) + deploy_master + end + + it 'returns every median for each stage for a specific project' do + values = described_class::STAGES.each_with_object({}) do |stage_name, hsh| + hsh[stage_name] = subject[stage_name].median.presence + end + + expect(subject.all_medians_per_stage).to eq(values) + end + end +end diff --git a/spec/support/cycle_analytics_helpers.rb b/spec/support/cycle_analytics_helpers.rb index d5ef80cfab2..7440894f1f4 100644 --- a/spec/support/cycle_analytics_helpers.rb +++ b/spec/support/cycle_analytics_helpers.rb @@ -26,6 +26,18 @@ module CycleAnalyticsHelpers ref: 'refs/heads/master').execute end + def create_cycle(user, project, issue, mr, milestone, pipeline) + issue.update(milestone: milestone) + pipeline.run + + ci_build = create(:ci_build, pipeline: pipeline, status: :success, author: user) + + merge_merge_requests_closing_issue(issue) + ProcessCommitWorker.new.perform(project.id, user.id, mr.commits.last.to_hash) + + ci_build + end + def create_merge_request_closing_issue(issue, message: nil, source_branch: nil, commit_message: 'commit message') if !source_branch || project.repository.commit(source_branch).blank? source_branch = generate(:branch) diff --git a/spec/support/cycle_analytics_helpers/test_generation.rb b/spec/support/cycle_analytics_helpers/test_generation.rb index da501a5077a..19b32c84d81 100644 --- a/spec/support/cycle_analytics_helpers/test_generation.rb +++ b/spec/support/cycle_analytics_helpers/test_generation.rb @@ -50,7 +50,7 @@ module CycleAnalyticsHelpers end median_time_difference = time_differences.sort[2] - expect(subject[phase].median.presence).to be_within(5).of(median_time_difference) + expect(subject[phase].median).to be_within(5).of(median_time_difference) end context "when the data belongs to another project" do |