Add latest changes from gitlab-org/gitlab@master

spec/lib/gitlab/cycle_analytics/review_event_fetcher_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
-require 'lib/gitlab/cycle_analytics/shared_event_spec'
 describe Gitlab::CycleAnalytics::ReviewEventFetcher do
   let(:stage_name) { :review }

spec/lib/gitlab/cycle_analytics/review_stage_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
-require 'lib/gitlab/cycle_analytics/shared_stage_spec'
 describe Gitlab::CycleAnalytics::ReviewStage do
   let(:stage_name) { :review }

spec/lib/gitlab/cycle_analytics/staging_event_fetcher_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
-require 'lib/gitlab/cycle_analytics/shared_event_spec'
 describe Gitlab::CycleAnalytics::StagingEventFetcher do
   let(:stage_name) { :staging }

spec/lib/gitlab/cycle_analytics/staging_stage_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
-require 'lib/gitlab/cycle_analytics/shared_stage_spec'
 describe Gitlab::CycleAnalytics::StagingStage do
   let(:stage_name) { :staging }

spec/lib/gitlab/cycle_analytics/test_event_fetcher_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
-require 'lib/gitlab/cycle_analytics/shared_event_spec'
 describe Gitlab::CycleAnalytics::TestEventFetcher do
   let(:stage_name) { :test }

spec/lib/gitlab/cycle_analytics/test_stage_spec.rb

 # frozen_string_literal: true
 require 'spec_helper'
-require 'lib/gitlab/cycle_analytics/shared_stage_spec'
 describe Gitlab::CycleAnalytics::TestStage do
   let(:stage_name) { :test }

spec/lib/gitlab/import_export/all_models.yml

@@ -208,6 +208,7 @@ ci_pipelines:
 - vulnerability_findings
 - pipeline_config
 - security_scans
+- daily_report_results
 pipeline_variables:
 - pipeline
 stages:
@@ -470,6 +471,7 @@ project:
 - status_page_setting
 - requirements
 - export_jobs
+- daily_report_results
 award_emoji:
 - awardable
 - user

spec/migrations/migrate_bot_type_to_user_type_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+require Rails.root.join('db', 'migrate', '20200311074438_migrate_bot_type_to_user_type.rb')
+
+describe MigrateBotTypeToUserType, :migration do
+  let(:users) { table(:users) }
+
+  it 'updates bots & ignores humans' do
+    users.create!(email: 'human', bot_type: nil, projects_limit: 0)
+    users.create!(email: 'support_bot', bot_type: 1, projects_limit: 0)
+    users.create!(email: 'alert_bot', bot_type: 2, projects_limit: 0)
+    users.create!(email: 'visual_review_bot', bot_type: 3, projects_limit: 0)
+
+    migrate!
+
+    expect(users.where('user_type IS NOT NULL').map(&:user_type)).to match_array([1, 2, 3])
+  end
+end

spec/models/ci/daily_report_result_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ci::DailyReportResult do
+  describe '.upsert_reports' do
+    let!(:rspec_coverage) do
+      create(
+        :ci_daily_report_result,
+        title: 'rspec',
+        date: '2020-03-09',
+        value: 71.2
+      )
+    end
+    let!(:new_pipeline) { create(:ci_pipeline) }
+
+    it 'creates or updates matching report results' do
+      described_class.upsert_reports([
+        {
+          project_id: rspec_coverage.project_id,
+          ref_path: rspec_coverage.ref_path,
+          param_type: described_class.param_types[rspec_coverage.param_type],
+          last_pipeline_id: new_pipeline.id,
+          date: rspec_coverage.date,
+          title: 'rspec',
+          value: 81.0
+        },
+        {
+          project_id: rspec_coverage.project_id,
+          ref_path: rspec_coverage.ref_path,
+          param_type: described_class.param_types[rspec_coverage.param_type],
+          last_pipeline_id: new_pipeline.id,
+          date: rspec_coverage.date,
+          title: 'karma',
+          value: 87.0
+        }
+      ])
+
+      rspec_coverage.reload
+
+      expect(rspec_coverage).to have_attributes(
+        last_pipeline_id: new_pipeline.id,
+        value: 81.0
+      )
+
+      expect(described_class.find_by_title('karma')).to have_attributes(
+        project_id: rspec_coverage.project_id,
+        ref_path: rspec_coverage.ref_path,
+        param_type: rspec_coverage.param_type,
+        last_pipeline_id: new_pipeline.id,
+        date: rspec_coverage.date,
+        value: 87.0
+      )
+    end
+
+    context 'when given data is empty' do
+      it 'does nothing' do
+        expect { described_class.upsert_reports([]) }.not_to raise_error
+      end
+    end
+  end
+end

spec/models/ci/pipeline_spec.rb

@@ -1120,7 +1120,7 @@ describe Ci::Pipeline, :mailer do
           let(:from_status) { status }
           it 'schedules pipeline success worker' do
-            expect(PipelineSuccessWorker).to receive(:perform_async).with(pipeline.id)
+            expect(Ci::DailyReportResultsWorker).to receive(:perform_in).with(10.minutes, pipeline.id)
             pipeline.succeed
           end
@@ -3114,4 +3114,25 @@ describe Ci::Pipeline, :mailer do
       end
     end
   end
+
+  describe '#source_ref_path' do
+    subject { pipeline.source_ref_path }
+
+    context 'when pipeline is for a branch' do
+      it { is_expected.to eq(Gitlab::Git::BRANCH_REF_PREFIX + pipeline.source_ref.to_s) }
+    end
+
+    context 'when pipeline is for a merge request' do
+      let(:merge_request) { create(:merge_request, source_project: project) }
+      let(:pipeline) { create(:ci_pipeline, project: project, head_pipeline_of: merge_request) }
+
+      it { is_expected.to eq(Gitlab::Git::BRANCH_REF_PREFIX + pipeline.source_ref.to_s) }
+    end
+
+    context 'when pipeline is for a tag' do
+      let(:pipeline) { create(:ci_pipeline, project: project, tag: true) }
+
+      it { is_expected.to eq(Gitlab::Git::TAG_REF_PREFIX + pipeline.source_ref.to_s) }
+    end
+  end
 end

spec/models/user_spec.rb

@@ -4244,12 +4244,12 @@ describe User, :do_not_mock_admin_mode do
     let!(:non_internal) { [user] }
     let!(:internal) { [ghost, alert_bot] }
-    it 'returns non internal users' do
+    it 'returns internal users' do
       expect(described_class.internal).to eq(internal)
       expect(internal.all?(&:internal?)).to eq(true)
     end
-    it 'returns internal users' do
+    it 'returns non internal users' do
       expect(described_class.non_internal).to eq(non_internal)
       expect(non_internal.all?(&:internal?)).to eq(false)
     end

spec/services/ci/daily_report_result_service_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ci::DailyReportResultService, '#execute' do
+  let!(:pipeline) { create(:ci_pipeline, created_at: '2020-02-06 00:01:10') }
+  let!(:rspec_job) { create(:ci_build, pipeline: pipeline, name: '3/3 rspec', coverage: 80) }
+  let!(:karma_job) { create(:ci_build, pipeline: pipeline, name: '2/2 karma', coverage: 90) }
+  let!(:extra_job) { create(:ci_build, pipeline: pipeline, name: 'extra', coverage: nil) }
+
+  it 'creates daily code coverage record for each job in the pipeline that has coverage value' do
+    described_class.new.execute(pipeline)
+
+    Ci::DailyReportResult.find_by(title: 'rspec').tap do |coverage|
+      expect(coverage).to have_attributes(
+        project_id: pipeline.project.id,
+        last_pipeline_id: pipeline.id,
+        ref_path: pipeline.source_ref_path,
+        param_type: 'coverage',
+        title: rspec_job.group_name,
+        value: rspec_job.coverage,
+        date: pipeline.created_at.to_date
+      )
+    end
+
+    Ci::DailyReportResult.find_by(title: 'karma').tap do |coverage|
+      expect(coverage).to have_attributes(
+        project_id: pipeline.project.id,
+        last_pipeline_id: pipeline.id,
+        ref_path: pipeline.source_ref_path,
+        param_type: 'coverage',
+        title: karma_job.group_name,
+        value: karma_job.coverage,
+        date: pipeline.created_at.to_date
+      )
+    end
+
+    expect(Ci::DailyReportResult.find_by(title: 'extra')).to be_nil
+  end
+
+  context 'when there is an existing daily code coverage for the matching date, project, ref_path, and group name' do
+    let!(:new_pipeline) do
+      create(
+        :ci_pipeline,
+        project: pipeline.project,
+        ref: pipeline.ref,
+        created_at: '2020-02-06 00:02:20'
+      )
+    end
+    let!(:new_rspec_job) { create(:ci_build, pipeline: new_pipeline, name: '4/4 rspec', coverage: 84) }
+    let!(:new_karma_job) { create(:ci_build, pipeline: new_pipeline, name: '3/3 karma', coverage: 92) }
+
+    before do
+      # Create the existing daily code coverage records
+      described_class.new.execute(pipeline)
+    end
+
+    it "updates the existing record's coverage value and last_pipeline_id" do
+      rspec_coverage = Ci::DailyReportResult.find_by(title: 'rspec')
+      karma_coverage = Ci::DailyReportResult.find_by(title: 'karma')
+
+      # Bump up the coverage values
+      described_class.new.execute(new_pipeline)
+
+      rspec_coverage.reload
+      karma_coverage.reload
+
+      expect(rspec_coverage).to have_attributes(
+        last_pipeline_id: new_pipeline.id,
+        value: new_rspec_job.coverage
+      )
+
+      expect(karma_coverage).to have_attributes(
+        last_pipeline_id: new_pipeline.id,
+        value: new_karma_job.coverage
+      )
+    end
+  end
+
+  context 'when the ID of the pipeline is older than the last_pipeline_id' do
+    let!(:new_pipeline) do
+      create(
+        :ci_pipeline,
+        project: pipeline.project,
+        ref: pipeline.ref,
+        created_at: '2020-02-06 00:02:20'
+      )
+    end
+    let!(:new_rspec_job) { create(:ci_build, pipeline: new_pipeline, name: '4/4 rspec', coverage: 84) }
+    let!(:new_karma_job) { create(:ci_build, pipeline: new_pipeline, name: '3/3 karma', coverage: 92) }
+
+    before do
+      # Create the existing daily code coverage records
+      # but in this case, for the newer pipeline first.
+      described_class.new.execute(new_pipeline)
+    end
+
+    it 'updates the existing daily code coverage records' do
+      rspec_coverage = Ci::DailyReportResult.find_by(title: 'rspec')
+      karma_coverage = Ci::DailyReportResult.find_by(title: 'karma')
+
+      # Run another one but for the older pipeline.
+      # This simulates the scenario wherein the success worker
+      # of an older pipeline, for some network hiccup, was delayed
+      # and only got executed right after the newer pipeline's success worker.
+      # Ideally, we don't want to bump the coverage value with an older one
+      # but given this can be a rare edge case and can be remedied by re-running
+      # the pipeline we'll just let it be for now. In return, we are able to use
+      # Rails 6 shiny new method, upsert_all, and simplify the code a lot.
+      described_class.new.execute(pipeline)
+
+      rspec_coverage.reload
+      karma_coverage.reload
+
+      expect(rspec_coverage).to have_attributes(
+        last_pipeline_id: pipeline.id,
+        value: rspec_job.coverage
+      )
+
+      expect(karma_coverage).to have_attributes(
+        last_pipeline_id: pipeline.id,
+        value: karma_job.coverage
+      )
+    end
+  end
+
+  context 'when pipeline has no builds with coverage' do
+    let!(:new_pipeline) do
+      create(
+        :ci_pipeline,
+        created_at: '2020-02-06 00:02:20'
+      )
+    end
+    let!(:some_job) { create(:ci_build, pipeline: new_pipeline, name: 'foo') }
+
+    it 'does nothing' do
+      expect { described_class.new.execute(new_pipeline) }.not_to raise_error
+    end
+  end
+end

spec/support/shared_examples/lib/gitlab/background_migration/mentions_migration_shared_examples.rb

@@ -22,14 +22,6 @@ shared_examples 'resource mentions migration' do |migration_class, resource_clas
 end
 shared_examples 'resource notes mentions migration' do |migration_class, resource_class|
-  before do
-    note1.becomes(Note).save!
-    note2.becomes(Note).save!
-    note3.becomes(Note).save!
-    note4.becomes(Note).save!
-    note5.becomes(Note).save(validate: false)
-  end
-
   it 'migrates mentions from note' do
     join = migration_class::JOIN
     conditions = migration_class::QUERY_CONDITIONS

spec/lib/gitlab/cycle_analytics/shared_stage_spec.rb → spec/support/shared_examples/lib/gitlab/cycle_analytics/base_stage_shared_examples.rb

@@ -2,9 +2,9 @@
 require 'spec_helper'
-shared_examples 'base stage' do
-  ISSUES_MEDIAN = 30.minutes.to_i
+ISSUES_MEDIAN = 30.minutes.to_i
+shared_examples 'base stage' do
   let(:stage) { described_class.new(options: { project: double }) }
   before do

spec/workers/ci/daily_report_results_worker_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ci::DailyReportResultsWorker do
+  describe '#perform' do
+    let!(:pipeline) { create(:ci_pipeline) }
+
+    subject { described_class.new.perform(pipeline_id) }
+
+    context 'when pipeline is found' do
+      let(:pipeline_id) { pipeline.id }
+
+      it 'executes service' do
+        expect_any_instance_of(Ci::DailyReportResultService)
+          .to receive(:execute).with(pipeline)
+
+        subject
+      end
+    end
+
+    context 'when pipeline is not found' do
+      let(:pipeline_id) { 123 }
+
+      it 'does not execute service' do
+        expect_any_instance_of(Ci::DailyReportResultService)
+          .not_to receive(:execute)
+
+        expect { subject }
+          .not_to raise_error
+      end
+    end
+  end
+end