Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 30 insertions, 1 deletions

diff --git a/spec/services/error_tracking/collect_error_service_spec.rb b/spec/services/error_tracking/collect_error_service_spec.rb
index ee9d0813e64..52d095148c8 100644
--- a/spec/services/error_tracking/collect_error_service_spec.rb
+++ b/spec/services/error_tracking/collect_error_service_spec.rb
@@ -4,7 +4,8 @@ require 'spec_helper'
 
 RSpec.describe ErrorTracking::CollectErrorService do
   let_it_be(:project) { create(:project) }
-  let_it_be(:parsed_event) { Gitlab::Json.parse(fixture_file('error_tracking/parsed_event.json')) }
+  let_it_be(:parsed_event_file) { 'error_tracking/parsed_event.json' }
+  let_it_be(:parsed_event) { Gitlab::Json.parse(fixture_file(parsed_event_file)) }
 
   subject { described_class.new(project, nil, event: parsed_event) }
 
@@ -41,6 +42,14 @@ RSpec.describe ErrorTracking::CollectErrorService do
       expect(event.payload).to eq parsed_event
     end
 
+    context 'python sdk event' do
+      let(:parsed_event) { Gitlab::Json.parse(fixture_file('error_tracking/python_event.json')) }
+
+      it 'creates a valid event' do
+        expect { subject.execute }.to change { ErrorTracking::ErrorEvent.count }.by(1)
+      end
+    end
+
     context 'unusual payload' do
       let(:modified_event) { parsed_event }
 
@@ -64,5 +73,25 @@ RSpec.describe ErrorTracking::CollectErrorService do
         end
       end
     end
+
+    context 'go payload' do
+      let(:parsed_event) { Gitlab::Json.parse(fixture_file('error_tracking/go_parsed_event.json')) }
+
+      it 'has correct values set' do
+        subject.execute
+
+        event = ErrorTracking::ErrorEvent.last
+        error = event.error
+
+        expect(error.name).to eq '*errors.errorString'
+        expect(error.description).to start_with 'Hello world'
+        expect(error.platform).to eq 'go'
+
+        expect(event.description).to start_with 'Hello world'
+        expect(event.level).to eq 'error'
+        expect(event.environment).to eq 'Accumulate'
+        expect(event.payload).to eq parsed_event
+      end
+    end
   end
 end