Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

3 files changed, 130 insertions, 6 deletions

diff --git a/spec/lib/gitlab/analytics/cycle_analytics/average_spec.rb b/spec/lib/gitlab/analytics/cycle_analytics/average_spec.rb
new file mode 100644
index 00000000000..e2fdd4918d5
--- /dev/null
+++ b/spec/lib/gitlab/analytics/cycle_analytics/average_spec.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Analytics::CycleAnalytics::Average do
+  let_it_be(:project) { create(:project) }
+
+  let_it_be(:issue_1) do
+    # Duration: 10 days
+    create(:issue, project: project, created_at: 20.days.ago).tap do |issue|
+      issue.metrics.update!(first_mentioned_in_commit_at: 10.days.ago)
+    end
+  end
+
+  let_it_be(:issue_2) do
+    # Duration: 5 days
+    create(:issue, project: project, created_at: 20.days.ago).tap do |issue|
+      issue.metrics.update!(first_mentioned_in_commit_at: 15.days.ago)
+    end
+  end
+
+  let(:stage) do
+    build(
+      :cycle_analytics_project_stage,
+      start_event_identifier: Gitlab::Analytics::CycleAnalytics::StageEvents::IssueCreated.identifier,
+      end_event_identifier: Gitlab::Analytics::CycleAnalytics::StageEvents::IssueFirstMentionedInCommit.identifier,
+      project: project
+    )
+  end
+
+  let(:query) { Issue.joins(:metrics).in_projects(project.id) }
+
+  around do |example|
+    freeze_time { example.run }
+  end
+
+  subject(:average) { described_class.new(stage: stage, query: query) }
+
+  describe '#seconds' do
+    subject(:average_duration_in_seconds) { average.seconds }
+
+    context 'when no results' do
+      let(:query) { Issue.none }
+
+      it { is_expected.to eq(nil) }
+    end
+
+    context 'returns the average duration in seconds' do
+      it { is_expected.to be_within(0.5).of(7.5.days.to_f) }
+    end
+  end
+
+  describe '#days' do
+    subject(:average_duration_in_days) { average.days }
+
+    context 'when no results' do
+      let(:query) { Issue.none }
+
+      it { is_expected.to eq(nil) }
+    end
+
+    context 'returns the average duration in days' do
+      it { is_expected.to be_within(0.01).of(7.5) }
+    end
+  end
+end
diff --git a/spec/lib/gitlab/analytics/cycle_analytics/sorting_spec.rb b/spec/lib/gitlab/analytics/cycle_analytics/sorting_spec.rb
new file mode 100644
index 00000000000..8f5be709a11
--- /dev/null
+++ b/spec/lib/gitlab/analytics/cycle_analytics/sorting_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Analytics::CycleAnalytics::Sorting do
+  let(:stage) { build(:cycle_analytics_project_stage, start_event_identifier: :merge_request_created, end_event_identifier: :merge_request_merged) }
+
+  subject(:order_values) { described_class.apply(MergeRequest.joins(:metrics), stage, sort, direction).order_values }
+
+  context 'when invalid sorting params are given' do
+    let(:sort) { :unknown_sort }
+    let(:direction) { :unknown_direction }
+
+    it 'falls back to end_event DESC sorting' do
+      expect(order_values).to eq([stage.end_event.timestamp_projection.desc])
+    end
+  end
+
+  context 'sorting end_event' do
+    let(:sort) { :end_event }
+
+    context 'direction desc' do
+      let(:direction) { :desc }
+
+      specify do
+        expect(order_values).to eq([stage.end_event.timestamp_projection.desc])
+      end
+    end
+
+    context 'direction asc' do
+      let(:direction) { :asc }
+
+      specify do
+        expect(order_values).to eq([stage.end_event.timestamp_projection.asc])
+      end
+    end
+  end
+
+  context 'sorting duration' do
+    let(:sort) { :duration }
+
+    context 'direction desc' do
+      let(:direction) { :desc }
+
+      specify do
+        expect(order_values).to eq([Arel::Nodes::Subtraction.new(stage.end_event.timestamp_projection, stage.start_event.timestamp_projection).desc])
+      end
+    end
+
+    context 'direction asc' do
+      let(:direction) { :asc }
+
+      specify do
+        expect(order_values).to eq([Arel::Nodes::Subtraction.new(stage.end_event.timestamp_projection, stage.start_event.timestamp_projection).asc])
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/analytics/instance_statistics/workers_argument_builder_spec.rb b/spec/lib/gitlab/analytics/usage_trends/workers_argument_builder_spec.rb
index 115c8145f59..34c5bd6c6ae 100644
--- a/spec/lib/gitlab/analytics/instance_statistics/workers_argument_builder_spec.rb
+++ b/spec/lib/gitlab/analytics/usage_trends/workers_argument_builder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Analytics::InstanceStatistics::WorkersArgumentBuilder do
+RSpec.describe Gitlab::Analytics::UsageTrends::WorkersArgumentBuilder do
   context 'when no measurement identifiers are given' do
     it 'returns empty array' do
       expect(described_class.new(measurement_identifiers: []).execute).to be_empty
@@ -16,8 +16,8 @@ RSpec.describe Gitlab::Analytics::InstanceStatistics::WorkersArgumentBuilder do
     let_it_be(:project_3) { create(:project, namespace: user_1.namespace, creator: user_1) }
 
     let(:recorded_at) { 2.days.ago }
-    let(:projects_measurement_identifier) { ::Analytics::InstanceStatistics::Measurement.identifiers.fetch(:projects) }
-    let(:users_measurement_identifier) { ::Analytics::InstanceStatistics::Measurement.identifiers.fetch(:users) }
+    let(:projects_measurement_identifier) { ::Analytics::UsageTrends::Measurement.identifiers.fetch(:projects) }
+    let(:users_measurement_identifier) { ::Analytics::UsageTrends::Measurement.identifiers.fetch(:users) }
     let(:measurement_identifiers) { [projects_measurement_identifier, users_measurement_identifier] }
 
     subject { described_class.new(measurement_identifiers: measurement_identifiers, recorded_at: recorded_at).execute }
@@ -46,19 +46,19 @@ RSpec.describe Gitlab::Analytics::InstanceStatistics::WorkersArgumentBuilder do
     context 'when custom min and max queries are present' do
       let(:min_id) { User.second.id }
       let(:max_id) { User.maximum(:id) }
-      let(:users_measurement_identifier) { ::Analytics::InstanceStatistics::Measurement.identifiers.fetch(:users) }
+      let(:users_measurement_identifier) { ::Analytics::UsageTrends::Measurement.identifiers.fetch(:users) }
 
       before do
         create_list(:user, 2)
 
         min_max_queries = {
-          ::Analytics::InstanceStatistics::Measurement.identifiers[:users] => {
+          ::Analytics::UsageTrends::Measurement.identifiers[:users] => {
             minimum_query: -> { min_id },
             maximum_query: -> { max_id }
           }
         }
 
-        allow(::Analytics::InstanceStatistics::Measurement).to receive(:identifier_min_max_queries) { min_max_queries }
+        allow(::Analytics::UsageTrends::Measurement).to receive(:identifier_min_max_queries) { min_max_queries }
       end
 
       subject do