Use ResourceLabelEvent for tracking label changes

2 files changed, 16 insertions, 4 deletions

diff --git a/spec/services/issues/move_service_spec.rb b/spec/services/issues/move_service_spec.rb
index 609eef76d2c..b5767583952 100644
--- a/spec/services/issues/move_service_spec.rb
+++ b/spec/services/issues/move_service_spec.rb
@@ -122,6 +122,17 @@ describe Issues::MoveService do
         end
       end
 
+      context 'issue with resource label events' do
+        it 'assigns resource label events to new issue' do
+          old_issue.resource_label_events = create_list(:resource_label_event, 2, issue: old_issue)
+
+          new_issue = move_service.execute(old_issue, new_project)
+
+          expected = old_issue.resource_label_events.map(&:label_id)
+          expect(new_issue.resource_label_events.map(&:label_id)).to match_array(expected)
+        end
+      end
+
       context 'generic issue' do
         include_context 'issue move executed'
 
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 5bcfef46b75..07aa8449a66 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -189,11 +189,12 @@ describe Issues::UpdateService, :mailer do
           expect(note.note).to include "assigned to #{user2.to_reference}"
         end
 
-        it 'creates system note about issue label edit' do
-          note = find_note('added ~')
+        it 'creates a resource label event' do
+          event = issue.resource_label_events.last
 
-          expect(note).not_to be_nil
-          expect(note.note).to include "added #{label.to_reference} label"
+          expect(event).not_to be_nil
+          expect(event.label_id).to eq label.id
+          expect(event.user_id).to eq user.id
         end
 
         it 'creates system note about title change' do