Fix tests

Author: timfish

packages/browser/src/client.ts

@@ -1,6 +1,6 @@
 import { BaseClient, Scope, SDK_VERSION } from '@sentry/core';
 import { AttachmentItem, ClientOptions, Event, EventHint, Options, Severity, SeverityLevel } from '@sentry/types';
-import { attachmentItemFromAttachment, getGlobalObject, logger } from '@sentry/utils';
+import { getGlobalObject, logger } from '@sentry/utils';
 
 import { eventFromException, eventFromMessage } from './eventbuilder';
 import { IS_DEBUG_BUILD } from './flags';
@@ -122,11 +122,4 @@ export class BrowserClient extends BaseClient<BrowserClientOptions> {
     }
     super._sendEvent(event, attachments);
   }
-
-  /**
-   * @inheritDoc
-   */
-  protected _getAttachments(scope: Scope | undefined): AttachmentItem[] {
-    return (scope?.getAttachments() || []).map(a => attachmentItemFromAttachment(a));
-  }
 }

packages/core/src/baseclient.ts

@@ -16,6 +16,7 @@ import {
   Transport,
 } from '@sentry/types';
 import {
+  attachmentItemFromAttachment,
   checkOrSetAlreadyCaught,
   dateTimestampInSeconds,
   isPlainObject,
@@ -656,6 +657,11 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
     );
   }
 
+  /** */
+  protected _getAttachments(scope: Scope | undefined): AttachmentItem[] {
+    return (scope?.getAttachments() || []).map(a => attachmentItemFromAttachment(a));
+  }
+
   /**
    * @inheritDoc
    */
@@ -671,9 +677,6 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
     _level?: Severity | SeverityLevel,
     _hint?: EventHint,
   ): PromiseLike<Event>;
-
-  /** */
-  protected abstract _getAttachments(scope: Scope | undefined): AttachmentItem[];
 }
 
 /**

packages/node/src/client.ts

@@ -155,7 +155,7 @@ export class NodeClient extends BaseClient<NodeClientOptions> {
    * @inheritDoc
    */
   protected _getAttachments(scope: Scope | undefined): AttachmentItem[] {
-    // TODO: load attachment from path...
+    // TODO: load any attachments from paths...
     return (scope?.getAttachments() || []).map(a => attachmentItemFromAttachment(a));
   }
 }

packages/utils/src/envelope.ts

@@ -47,7 +47,10 @@ export function serializeEnvelope(envelope: Envelope): string | Uint8Array {
   return hasBinaryAttachment ? serializeBinaryEnvelope(envelope) : serializeStringEnvelope(envelope);
 }
 
-function serializeStringEnvelope(envelope: Envelope): string {
+/**
+ * Serializes an envelope to a string.
+ */
+export function serializeStringEnvelope(envelope: Envelope): string {
   const [headers, items] = envelope;
   const serializedHeaders = JSON.stringify(headers);
 

packages/utils/test/envelope.test.ts

@@ -1,6 +1,6 @@
 import { EventEnvelope } from '@sentry/types';
 
-import { addItemToEnvelope, createEnvelope, getEnvelopeType, serializeEnvelope } from '../src/envelope';
+import { addItemToEnvelope, createEnvelope, getEnvelopeType, serializeStringEnvelope } from '../src/envelope';
 import { parseEnvelope } from './testutils';
 
 describe('envelope', () => {
@@ -17,10 +17,10 @@ describe('envelope', () => {
     });
   });
 
-  describe('serializeEnvelope()', () => {
+  describe('serializeStringEnvelope()', () => {
     it('serializes an envelope', () => {
       const env = createEnvelope<EventEnvelope>({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' }, []);
-      expect(serializeEnvelope(env)).toMatchInlineSnapshot(
+      expect(serializeStringEnvelope(env)).toMatchInlineSnapshot(
         '"{\\"event_id\\":\\"aa3ff046696b4bc6b609ce6d28fde9e2\\",\\"sent_at\\":\\"123\\"}"',
       );
     });
@@ -29,15 +29,15 @@ describe('envelope', () => {
   describe('addItemToEnvelope()', () => {
     it('adds an item to an envelope', () => {
       const env = createEnvelope<EventEnvelope>({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' }, []);
-      const parsedEnvelope = parseEnvelope(serializeEnvelope(env));
+      const parsedEnvelope = parseEnvelope(serializeStringEnvelope(env));
       expect(parsedEnvelope).toHaveLength(1);
       expect(parsedEnvelope[0]).toEqual({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' });
 
       const newEnv = addItemToEnvelope<EventEnvelope>(env, [
         { type: 'event' },
         { event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2' },
       ]);
-      const parsedNewEnvelope = parseEnvelope(serializeEnvelope(newEnv));
+      const parsedNewEnvelope = parseEnvelope(serializeStringEnvelope(newEnv));
       expect(parsedNewEnvelope).toHaveLength(3);
       expect(parsedNewEnvelope[0]).toEqual({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' });
       expect(parsedNewEnvelope[1]).toEqual({ type: 'event' });
@@ -49,7 +49,7 @@ describe('envelope', () => {
     it('returns the type of the envelope', () => {
       const env = createEnvelope<EventEnvelope>({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' }, [
         [{ type: 'event' }, { event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2' }],
-        [{ type: 'attachment', filename: 'me.txt' }, '123456'],
+        [{ type: 'attachment', filename: 'me.txt', length: 6 }, new Uint8Array(6)],
       ]);
       expect(getEnvelopeType(env)).toEqual('event');
     });