Add latest changes from gitlab-org/gitlab@master

spec/services/issuable/clone/attributes_rewriter_spec.rb

@@ -75,5 +75,47 @@ describe Issuable::Clone::AttributesRewriter do
       expect(new_issue.reload.milestone).to eq(milestone)
     end
+
+    context 'with existing milestone events' do
+      let!(:milestone1_project1) { create(:milestone, title: 'milestone1', project: project1) }
+      let!(:milestone2_project1) { create(:milestone, title: 'milestone2', project: project1) }
+      let!(:milestone3_project1) { create(:milestone, title: 'milestone3', project: project1) }
+
+      let!(:milestone1_project2) { create(:milestone, title: 'milestone1', project: project2) }
+      let!(:milestone2_project2) { create(:milestone, title: 'milestone2', project: project2) }
+
+      before do
+        original_issue.update(milestone: milestone2_project1)
+
+        create_event(milestone1_project1)
+        create_event(milestone2_project1)
+        create_event(milestone1_project1, 'remove')
+        create_event(milestone3_project1)
+      end
+
+      it 'copies existing resource milestone events' do
+        subject.execute
+
+        new_issue_milestone_events = new_issue.reload.resource_milestone_events
+        expect(new_issue_milestone_events.count).to eq(3)
+
+        expect_milestone_event(new_issue_milestone_events.first, milestone: milestone1_project2, action: 'add', state: 'opened')
+        expect_milestone_event(new_issue_milestone_events.second, milestone: milestone2_project2, action: 'add', state: 'opened')
+        expect_milestone_event(new_issue_milestone_events.third, milestone: milestone1_project2, action: 'remove', state: 'opened')
+      end
+
+      def create_event(milestone, action = 'add')
+        create(:resource_milestone_event, issue: original_issue, milestone: milestone, action: action)
+      end
+
+      def expect_milestone_event(event, expected_attrs)
+        expect(event.milestone_id).to eq(expected_attrs[:milestone].id)
+        expect(event.action).to eq(expected_attrs[:action])
+        expect(event.state).to eq(expected_attrs[:state])
+
+        expect(event.reference).to be_nil
+        expect(event.reference_html).to be_nil
+      end
+    end
   end
 end

spec/services/issuable/common_system_notes_service_spec.rb

@@ -3,8 +3,9 @@
 require 'spec_helper'
 describe Issuable::CommonSystemNotesService do
-  let(:user) { create(:user) }
-  let(:project) { create(:project) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+
   let(:issuable) { create(:issue, project: project) }
   context 'on issuable update' do
@@ -35,6 +36,8 @@ describe Issuable::CommonSystemNotesService do
       before do
         milestone = create(:milestone, project: project)
         issuable.milestone_id = milestone.id
+
+        stub_feature_flags(track_resource_milestone_change_events: false)
       end
       it_behaves_like 'system note creation', {}, 'changed milestone'
@@ -97,12 +100,39 @@ describe Issuable::CommonSystemNotesService do
       expect(event.user_id).to eq user.id
     end
-    it 'creates a system note for milestone set' do
-      issuable.milestone = create(:milestone, project: project)
-      issuable.save
-      expect { subject }.to change { issuable.notes.count }.from(0).to(1)
-      expect(issuable.notes.last.note).to match('changed milestone')
+    context 'when milestone change event tracking is disabled' do
+      before do
+        stub_feature_flags(track_resource_milestone_change_events: false)
+        issuable.milestone = create(:milestone, project: project)
+        issuable.save
+      end
+
+      it 'creates a system note for milestone set' do
+        expect { subject }.to change { issuable.notes.count }.from(0).to(1)
+        expect(issuable.notes.last.note).to match('changed milestone')
+      end
+
+      it 'does not create a milestone change event' do
+        expect { subject }.not_to change { ResourceMilestoneEvent.count }
+      end
+    end
+
+    context 'when milestone change event tracking is enabled' do
+      let_it_be(:milestone) { create(:milestone, project: project) }
+      let_it_be(:issuable) { create(:issue, project: project, milestone: milestone) }
+
+      before do
+        stub_feature_flags(track_resource_milestone_change_events: true)
+      end
+
+      it 'does not create a system note for milestone set' do
+        expect { subject }.not_to change { issuable.notes.count }
+      end
+
+      it 'creates a milestone change event' do
+        expect { subject }.to change { ResourceMilestoneEvent.count }.from(0).to(1)
+      end
     end
     it 'creates a system note for due_date set' do

spec/services/issues/update_service_spec.rb

@@ -385,6 +385,10 @@ describe Issues::UpdateService, :mailer do
       end
       context 'when the milestone is removed' do
+        before do
+          stub_feature_flags(track_resource_milestone_change_events: false)
+        end
+
         let!(:non_subscriber) { create(:user) }
         let!(:subscriber) do
@@ -411,6 +415,10 @@ describe Issues::UpdateService, :mailer do
       end
       context 'when the milestone is changed' do
+        before do
+          stub_feature_flags(track_resource_milestone_change_events: false)
+        end
+
         let!(:non_subscriber) { create(:user) }
         let!(:subscriber) do

spec/services/merge_requests/update_service_spec.rb

@@ -367,6 +367,10 @@ describe MergeRequests::UpdateService, :mailer do
       end
       context 'when the milestone is removed' do
+        before do
+          stub_feature_flags(track_resource_milestone_change_events: false)
+        end
+
         let!(:non_subscriber) { create(:user) }
         let!(:subscriber) do
@@ -393,6 +397,10 @@ describe MergeRequests::UpdateService, :mailer do
       end
       context 'when the milestone is changed' do
+        before do
+          stub_feature_flags(track_resource_milestone_change_events: false)
+        end
+
         let!(:non_subscriber) { create(:user) }
         let!(:subscriber) do

spec/services/resource_events/change_milestone_service_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ResourceEvents::ChangeMilestoneService do
+  shared_examples 'milestone events creator' do
+    let_it_be(:user) { create(:user) }
+
+    let_it_be(:milestone) { create(:milestone) }
+
+    context 'when milestone is present' do
+      before do
+        resource.milestone = milestone
+      end
+
+      let(:service) { described_class.new(resource: resource, user: user, created_at: created_at_time) }
+
+      it 'creates the expected event record' do
+        expect { service.execute }.to change { ResourceMilestoneEvent.count }.from(0).to(1)
+
+        events = ResourceMilestoneEvent.all
+
+        expect(events.size).to eq(1)
+        expect_event_record(events.first, action: 'add', milestone: milestone, state: 'opened')
+      end
+    end
+
+    context 'when milestones is not present' do
+      before do
+        resource.milestone = nil
+      end
+
+      let(:service) { described_class.new(resource: resource, user: user, created_at: created_at_time) }
+
+      it 'creates the expected event records' do
+        expect { service.execute }.to change { ResourceMilestoneEvent.count }.from(0).to(1)
+
+        expect_event_record(ResourceMilestoneEvent.first, action: 'remove', milestone: nil, state: 'opened')
+      end
+    end
+
+    def expect_event_record(event, expected_attrs)
+      expect(event.action).to eq(expected_attrs[:action])
+      expect(event.state).to eq(expected_attrs[:state])
+      expect(event.user).to eq(user)
+      expect(event.issue).to eq(resource) if resource.is_a?(Issue)
+      expect(event.issue).to be_nil unless resource.is_a?(Issue)
+      expect(event.merge_request).to eq(resource) if resource.is_a?(MergeRequest)
+      expect(event.merge_request).to be_nil unless resource.is_a?(MergeRequest)
+      expect(event.milestone).to eq(expected_attrs[:milestone])
+      expect(event.created_at).to eq(created_at_time)
+    end
+  end
+
+  let_it_be(:merge_request) { create(:merge_request) }
+  let_it_be(:issue) { create(:issue) }
+
+  let!(:created_at_time) { Time.utc(2019, 12, 30) }
+
+  it_behaves_like 'milestone events creator' do
+    let(:resource) { issue }
+  end
+
+  it_behaves_like 'milestone events creator' do
+    let(:resource) { merge_request }
+  end
+end

spec/spec_helper.rb

@@ -119,6 +119,7 @@ RSpec.configure do |config|
   config.include PolicyHelpers, type: :policy
   config.include MemoryUsageHelper
   config.include ExpectRequestWithStatus, type: :request
+  config.include IdempotentWorkerHelper, type: :worker
   config.include RailsHelpers
   if ENV['CI'] || ENV['RETRIES']

spec/support/helpers/idempotent_worker_helper.rb

+# frozen_string_literal: true
+
+module IdempotentWorkerHelper
+  WORKER_EXEC_TIMES = 2
+
+  def perform_multiple(args = [], worker: described_class.new, exec_times: WORKER_EXEC_TIMES)
+    Sidekiq::Testing.inline! do
+      job_args = args.nil? ? [nil] : Array.wrap(args)
+
+      expect(worker).to receive(:perform).exactly(exec_times).and_call_original
+
+      exec_times.times { worker.perform(*job_args) }
+    end
+  end
+end

spec/support/shared_examples/quick_actions/issue/move_quick_action_shared_examples.rb

@@ -50,6 +50,8 @@ RSpec.shared_examples 'move quick action' do
       let(:bug)      { create(:label, project: project, title: 'bug') }
       let(:wontfix)  { create(:label, project: project, title: 'wontfix') }
+      let!(:target_milestone) { create(:milestone, title: '1.0', project: target_project) }
+
       before do
         target_project.add_maintainer(user)
       end

spec/support/shared_examples/resource_events.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+shared_examples 'a resource event' do
+  let_it_be(:user1) { create(:user) }
+  let_it_be(:user2) { create(:user) }
+
+  let_it_be(:issue1) { create(:issue, author: user1) }
+  let_it_be(:issue2) { create(:issue, author: user1) }
+  let_it_be(:issue3) { create(:issue, author: user2) }
+
+  describe 'validations' do
+    it { is_expected.not_to allow_value(nil).for(:user) }
+  end
+
+  describe 'associations' do
+    it { is_expected.to belong_to(:user) }
+  end
+
+  describe '.created_after' do
+    let!(:created_at1) { 1.day.ago }
+    let!(:created_at2) { 2.days.ago }
+    let!(:created_at3) { 3.days.ago }
+
+    let!(:event1) { create(described_class.name.underscore.to_sym, issue: issue1, created_at: created_at1) }
+    let!(:event2) { create(described_class.name.underscore.to_sym, issue: issue2, created_at: created_at2) }
+    let!(:event3) { create(described_class.name.underscore.to_sym, issue: issue2, created_at: created_at3) }
+
+    it 'returns the expected events' do
+      events = described_class.created_after(created_at3)
+
+      expect(events).to contain_exactly(event1, event2)
+    end
+
+    it 'returns no events if time is after last record time' do
+      events = described_class.created_after(1.minute.ago)
+
+      expect(events).to be_empty
+    end
+  end
+end
+
+shared_examples 'a resource event for issues' do
+  let_it_be(:user1) { create(:user) }
+  let_it_be(:user2) { create(:user) }
+
+  let_it_be(:issue1) { create(:issue, author: user1) }
+  let_it_be(:issue2) { create(:issue, author: user1) }
+  let_it_be(:issue3) { create(:issue, author: user2) }
+
+  describe 'associations' do
+    it { is_expected.to belong_to(:issue) }
+  end
+
+  describe '.by_issue' do
+    let_it_be(:event1) { create(described_class.name.underscore.to_sym, issue: issue1) }
+    let_it_be(:event2) { create(described_class.name.underscore.to_sym, issue: issue2) }
+    let_it_be(:event3) { create(described_class.name.underscore.to_sym, issue: issue1) }
+
+    it 'returns the expected records for an issue with events' do
+      events = described_class.by_issue(issue1)
+
+      expect(events).to contain_exactly(event1, event3)
+    end
+
+    it 'returns the expected records for an issue with no events' do
+      events = described_class.by_issue(issue3)
+
+      expect(events).to be_empty
+    end
+  end
+end
+
+shared_examples 'a resource event for merge requests' do
+  let_it_be(:user1) { create(:user) }
+  let_it_be(:user2) { create(:user) }
+
+  let_it_be(:merge_request1) { create(:merge_request, author: user1) }
+  let_it_be(:merge_request2) { create(:merge_request, author: user1) }
+  let_it_be(:merge_request3) { create(:merge_request, author: user2) }
+
+  describe 'associations' do
+    it { is_expected.to belong_to(:merge_request) }
+  end
+
+  describe '.by_merge_request' do
+    let_it_be(:event1) { create(described_class.name.underscore.to_sym, merge_request: merge_request1) }
+    let_it_be(:event2) { create(described_class.name.underscore.to_sym, merge_request: merge_request2) }
+    let_it_be(:event3) { create(described_class.name.underscore.to_sym, merge_request: merge_request1) }
+
+    it 'returns the expected records for an issue with events' do
+      events = described_class.by_merge_request(merge_request1)
+
+      expect(events).to contain_exactly(event1, event3)
+    end
+
+    it 'returns the expected records for an issue with no events' do
+      events = described_class.by_merge_request(merge_request3)
+
+      expect(events).to be_empty
+    end
+  end
+end

spec/support/shared_examples/workers/idempotency_shared_examples.rb

+# frozen_string_literal: true
+
+# This shared_example requires the following variables:
+# - job_args (if not given, will fallback to call perform without arguments)
+#
+# Usage:
+#
+#   include_examples 'an idempotent worker' do
+#     it 'checks the side-effects for multiple calls' do
+#       # it'll call the job's perform method 3 times
+#       # by default.
+#       subject
+#
+#       expect(model.state).to eq('state')
+#     end
+#   end
+#
+RSpec.shared_examples 'an idempotent worker' do
+  # Avoid stubbing calls for a more accurate run.
+  subject do
+    defined?(job_args) ? perform_multiple(job_args) : perform_multiple
+  end
+
+  it 'is labeled as idempotent' do
+    expect(described_class).to be_idempotent
+  end
+
+  it 'performs multiple times sequentially without raising an exception' do
+    expect { subject }.not_to raise_error
+  end
+end

spec/workers/background_migration_worker_spec.rb

@@ -11,7 +11,7 @@ describe BackgroundMigrationWorker, :clean_gitlab_redis_shared_state do
     end
   end
-  describe '.perform' do
+  describe '#perform' do
     it 'performs a background migration' do
       expect(Gitlab::BackgroundMigration)
         .to receive(:perform)
@@ -52,6 +52,14 @@ describe BackgroundMigrationWorker, :clean_gitlab_redis_shared_state do
       worker.perform('Foo', [10, 20])
     end
+
+    it 'sets the class that will be executed as the caller_id' do
+      expect(Gitlab::BackgroundMigration).to receive(:perform) do
+        expect(Labkit::Context.current.to_h).to include('meta.caller_id' => 'Foo')
+      end
+
+      worker.perform('Foo', [10, 20])
+    end
   end
   describe '#healthy_database?' do

spec/workers/expire_job_cache_worker_spec.rb

@@ -6,20 +6,32 @@ describe ExpireJobCacheWorker do
   set(:pipeline) { create(:ci_empty_pipeline) }
   let(:project) { pipeline.project }
-  subject { described_class.new }
-
   describe '#perform' do
     context 'with a job in the pipeline' do
       let(:job) { create(:ci_build, pipeline: pipeline) }
-      it 'invalidates Etag caching for the job path' do
-        pipeline_path = "/#{project.full_path}/pipelines/#{pipeline.id}.json"
-        job_path = "/#{project.full_path}/builds/#{job.id}.json"
-        expect_any_instance_of(Gitlab::EtagCaching::Store).to receive(:touch).with(pipeline_path)
-        expect_any_instance_of(Gitlab::EtagCaching::Store).to receive(:touch).with(job_path)
-        subject.perform(job.id)
+      let(:job_args) { job.id }
+
+      include_examples 'an idempotent worker' do
+        it 'invalidates Etag caching for the job path' do
+          pipeline_path = "/#{project.full_path}/pipelines/#{pipeline.id}.json"
+          job_path = "/#{project.full_path}/builds/#{job.id}.json"
+
+          spy_store = Gitlab::EtagCaching::Store.new
+
+          allow(Gitlab::EtagCaching::Store).to receive(:new) { spy_store }
+          expect(spy_store).to receive(:touch)
+            .exactly(IdempotentWorkerHelper::WORKER_EXEC_TIMES).times
+            .with(pipeline_path)
+            .and_call_original
+          expect(spy_store).to receive(:touch)
+            .exactly(IdempotentWorkerHelper::WORKER_EXEC_TIMES).times
+            .with(job_path)
+            .and_call_original
+          subject
+        end
       end
     end
@@ -27,7 +39,7 @@ describe ExpireJobCacheWorker do
       it 'does not change the etag store' do
         expect(Gitlab::EtagCaching::Store).not_to receive(:new)
-        subject.perform(9999)
+        perform_multiple(9999)
       end
     end
   end