3 files changed, 42 insertions, 4 deletions

diff --git a/spec/requests/api/graphql/mutations/incident_management/timeline_event/create_spec.rb b/spec/requests/api/graphql/mutations/incident_management/timeline_event/create_spec.rb
index 923e12a3c06..fc3b666dd3d 100644
--- a/spec/requests/api/graphql/mutations/incident_management/timeline_event/create_spec.rb
+++ b/spec/requests/api/graphql/mutations/incident_management/timeline_event/create_spec.rb
@@ -10,8 +10,16 @@ RSpec.describe 'Creating an incident timeline event' do
   let_it_be(:incident) { create(:incident, project: project) }
   let_it_be(:event_occurred_at) { Time.current }
   let_it_be(:note) { 'demo note' }
+  let_it_be(:tag1) { create(:incident_management_timeline_event_tag, project: project, name: 'Tag 1') }
+  let_it_be(:tag2) { create(:incident_management_timeline_event_tag, project: project, name: 'Tag 2') }
+
+  let(:input) do
+    { incident_id: incident.to_global_id.to_s,
+      note: note,
+      occurred_at: event_occurred_at,
+      timeline_event_tag_names: [tag1.name] }
+  end
 
-  let(:input) { { incident_id: incident.to_global_id.to_s, note: note, occurred_at: event_occurred_at } }
   let(:mutation) do
     graphql_mutation(:timeline_event_create, input) do
       <<~QL
@@ -22,6 +30,7 @@ RSpec.describe 'Creating an incident timeline event' do
           author { id username }
           incident { id title }
           note
+          timelineEventTags { nodes { name } }
           editable
           action
           occurredAt
@@ -57,4 +66,25 @@ RSpec.describe 'Creating an incident timeline event' do
       'occurredAt' => event_occurred_at.iso8601
     )
   end
+
+  context 'when note is more than 280 characters long' do
+    let_it_be(:note) { 'n' * 281 }
+
+    it_behaves_like 'timeline event mutation responds with validation error',
+      error_message: 'Timeline text is too long (maximum is 280 characters)'
+  end
+
+  context 'when timeline event tags are passed' do
+    it 'creates incident timeline event with tags', :aggregate_failures do
+      post_graphql_mutation(mutation, current_user: user)
+
+      timeline_event_response = mutation_response['timelineEvent']
+      tag_names = timeline_event_response['timelineEventTags']['nodes']
+
+      expect(response).to have_gitlab_http_status(:success)
+      expect(timeline_event_response).to include(
+        'timelineEventTags' => { 'nodes' => tag_names }
+      )
+    end
+  end
 end
diff --git a/spec/requests/api/graphql/mutations/incident_management/timeline_event/promote_from_note_spec.rb b/spec/requests/api/graphql/mutations/incident_management/timeline_event/promote_from_note_spec.rb
index 85eaec90f47..62eeecb3fb7 100644
--- a/spec/requests/api/graphql/mutations/incident_management/timeline_event/promote_from_note_spec.rb
+++ b/spec/requests/api/graphql/mutations/incident_management/timeline_event/promote_from_note_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe 'Promote an incident timeline event from a comment' do
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
   let_it_be(:incident) { create(:incident, project: project) }
-  let_it_be(:comment) { create(:note, project: project, noteable: incident) }
+  let_it_be(:comment) { create(:note, project: project, noteable: incident, note: 'a' * 281) }
 
   let(:input) { { note_id: comment.to_global_id.to_s } }
   let(:mutation) do
diff --git a/spec/requests/api/graphql/mutations/incident_management/timeline_event/update_spec.rb b/spec/requests/api/graphql/mutations/incident_management/timeline_event/update_spec.rb
index 1c4439cec6f..542d51b990f 100644
--- a/spec/requests/api/graphql/mutations/incident_management/timeline_event/update_spec.rb
+++ b/spec/requests/api/graphql/mutations/incident_management/timeline_event/update_spec.rb
@@ -13,11 +13,12 @@ RSpec.describe 'Updating an incident timeline event' do
   end
 
   let(:occurred_at) { 1.minute.ago.iso8601 }
+  let(:note) { 'Updated note' }
 
   let(:variables) do
     {
       id: timeline_event.to_global_id.to_s,
-      note: 'Updated note',
+      note: note,
       occurred_at: occurred_at
     }
   end
@@ -70,11 +71,18 @@ RSpec.describe 'Updating an incident timeline event' do
         'id' => incident.to_global_id.to_s,
         'title' => incident.title
       },
-      'note' => 'Updated note',
+      'note' => note,
       'noteHtml' => timeline_event.note_html,
       'occurredAt' => occurred_at,
       'createdAt' => timeline_event.created_at.iso8601,
       'updatedAt' => timeline_event.updated_at.iso8601
     )
   end
+
+  context 'when note is more than 280 characters long' do
+    let(:note) { 'n' * 281 }
+
+    it_behaves_like 'timeline event mutation responds with validation error',
+      error_message: 'Timeline text is too long (maximum is 280 characters)'
+  end
 end