Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 7 insertions, 5 deletions

diff --git a/spec/models/system_note_metadata_spec.rb b/spec/models/system_note_metadata_spec.rb
index 144c65d2f62..36bcb3499b3 100644
--- a/spec/models/system_note_metadata_spec.rb
+++ b/spec/models/system_note_metadata_spec.rb
@@ -19,12 +19,14 @@ RSpec.describe SystemNoteMetadata do
       it { is_expected.to be_invalid }
     end
 
-    context 'when action type is valid' do
-      subject do
-        build(:system_note_metadata, note: build(:note), action: 'merge')
-      end
+    %i[merge timeline_event].each do |action|
+      context 'when action type is valid' do
+        subject do
+          build(:system_note_metadata, note: build(:note), action: action)
+        end
 
-      it { is_expected.to be_valid }
+        it { is_expected.to be_valid }
+      end
     end
 
     context 'when importing' do