fix tests

Author: neSpecc

jest.setup.js

@@ -27,3 +27,7 @@ const mockedAmqpConnection = {
 const mockedConnect = amqp.connect;
 
 mockedConnect.mockResolvedValue(Promise.resolve(mockedAmqpConnection));
+
+module.exports = {
+  mockedAmqpChannel,
+};

workers/sentry/jest.config.js

@@ -1,3 +1,7 @@
+/**
+ * We don't need mongo for this worker, so it has own setup file
+ */
+
 /**
  * To prevent problems related to timezones we set node timezone
  */
@@ -21,6 +25,4 @@ module.exports = {
   },
 
   setupFiles: [ './../../jest.setup.js' ],
-
-  setupFilesAfterEnv: [ './../../jest.setup.redis-mock.js' ],
 };

workers/sentry/src/index.ts

@@ -4,7 +4,7 @@ import { DefaultEventWorkerTask } from '../../default/types/default-event-worker
 import WorkerNames from '../../../lib/workerNames.js';
 import { Envelope, EnvelopeItem, EventEnvelope, EventItem, parseEnvelope } from '@sentry/core';
 import { Worker } from '../../../lib/worker';
-import { composeBacktrace, composeContext, composeTitle, composeUserData } from './utils/converter';
+import { composeAddons, composeBacktrace, composeContext, composeTitle, composeUserData } from './utils/converter';
 import { b64decode } from './utils/base64';
 /**
  * Worker for handling Sentry events
@@ -30,10 +30,6 @@ export default class SentryEventWorker extends Worker {
 
     try {
       const rawEvent = b64decode(event.payload.envelope);
-
-      console.log('event', event.payload.envelope);
-      console.log('parsed', rawEvent);
-
       const envelope = parseEnvelope(rawEvent);
 
       this.logger.debug(JSON.stringify(envelope));
@@ -110,22 +106,25 @@ export default class SentryEventWorker extends Worker {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars, no-unused-vars
     const [_eventHeaders, eventPayload] = eventItem;
 
+    const title = composeTitle(eventPayload);
     const backtrace = composeBacktrace(eventPayload);
     const context = composeContext(eventPayload);
     const user = composeUserData(eventPayload);
+    const addons = composeAddons(eventPayload);
 
     return {
       projectId, // Public key is used as hawk project ID
       catcherType: 'errors/sentry',
       payload: {
-        title: composeTitle(eventPayload),
+        title,
         type: eventPayload.level || 'error',
         timestamp: sentAtUnix,
         backtrace,
         release: trace?.release || undefined,
         context,
         catcherVersion: pkg.version,
         user,
+        addons,
       },
     };
   }

workers/sentry/src/utils/converter.ts

@@ -29,7 +29,7 @@ export function composeBacktrace(eventPayload: SentryEvent): EventData<DefaultAd
 
       const isSomeLinesAvailable = frame.context_line || frame.pre_context || frame.post_context;
 
-      if (isSomeLinesAvailable && frame.lineno) {
+      if (isSomeLinesAvailable && frame.lineno !== undefined) {
         sourceCode = [];
         const lineNo = frame.lineno;
 

workers/sentry/tests/index.test.ts

@@ -1,10 +1,9 @@
 import SentryEventWorker from '../src';
 import { SentryEventWorkerTask } from '../types/sentry-event-worker-task';
 import '../../../env-test';
-import { mockedAmqpChannel } from './rabbit.mock';
+import { mockedAmqpChannel } from '../../../jest.setup.js';
 import { ClientReportEnvelope, ClientReportItem } from '@sentry/core';
 import { b64encode } from '../src/utils/base64';
-jest.mock('amqplib');
 
 /**
  * Testing Event
@@ -18,6 +17,15 @@ const testEventData = {
 describe('SentryEventWorker', () => {
   const worker = new SentryEventWorker();
 
+  beforeEach(async () => {
+    await worker.start();
+  });
+
+  afterEach(async () => {
+    await worker.finish();
+    jest.clearAllMocks();
+  });
+
   test('should not handle bad event data', async () => {
     const handleEvent = async (): Promise<void> => {
       await worker.handle({} as SentryEventWorkerTask);