Add latest changes from gitlab-org/gitlab@master

2 files changed, 79 insertions, 7 deletions

diff --git a/spec/services/issuable/clone/attributes_rewriter_spec.rb b/spec/services/issuable/clone/attributes_rewriter_spec.rb
index 20bda6984bd..6bc0df8260b 100644
--- a/spec/services/issuable/clone/attributes_rewriter_spec.rb
+++ b/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
diff --git a/spec/services/issuable/common_system_notes_service_spec.rb b/spec/services/issuable/common_system_notes_service_spec.rb
index 7e40ac9ff4d..771e7ca42c9 100644
--- a/spec/services/issuable/common_system_notes_service_spec.rb
+++ b/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
+    context 'when milestone change event tracking is disabled' do
+      before do
+        stub_feature_flags(track_resource_milestone_change_events: false)
 
-      expect { subject }.to change { issuable.notes.count }.from(0).to(1)
-      expect(issuable.notes.last.note).to match('changed milestone')
+        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