fix tests

Author: lobsterkatie

packages/core/test/lib/request.test.ts

@@ -1,8 +1,15 @@
 import { Event, SentryRequest, TransactionSamplingMethod } from '@sentry/types';
+import { addBase64MethodsToCarrier } from '@sentry/utils';
 
+// Note: yes, it's gross importing from another package by path rather than the real way, but the real way causes
+// circular dependency warnings, even though it's only for tests. See https://github.com/lerna/lerna/issues/1198.
+// @ts-ignore See above
+import { unsafeFromBase64, unsafeToBase64 } from '../../../node/src/string';
 import { API } from '../../src/api';
 import { eventToSentryRequest } from '../../src/request';
 
+addBase64MethodsToCarrier({ unsafeFromBase64, unsafeToBase64 });
+
 describe('eventToSentryRequest', () => {
   function parseEnvelopeRequest(request: SentryRequest): any {
     const [envelopeHeaderString, itemHeaderString, eventString] = request.body.split('\n');

packages/node/test/integrations/http.test.ts

@@ -2,11 +2,15 @@ import * as sentryCore from '@sentry/core';
 import { Hub } from '@sentry/hub';
 import * as hubModule from '@sentry/hub';
 import { addExtensionMethods, SENTRY_TRACE_REGEX, Span, Transaction } from '@sentry/tracing';
+import { addBase64MethodsToCarrier } from '@sentry/utils';
 import * as http from 'http';
 import * as nock from 'nock';
 
 import { NodeClient } from '../../src/client';
 import { Http as HttpIntegration } from '../../src/integrations/http';
+import { unsafeFromBase64, unsafeToBase64 } from '../../src/string';
+
+addBase64MethodsToCarrier({ unsafeFromBase64, unsafeToBase64 });
 
 describe('tracing', () => {
   function createTransactionOnScope(): Transaction {

packages/tracing/test/browser/request.test.ts

@@ -1,3 +1,7 @@
+/**
+ * @jest-environment ../../../.jest/dom-environment
+ */
+
 import { BrowserClient } from '@sentry/browser';
 import { Hub, makeMain } from '@sentry/hub';
 import * as utils from '@sentry/utils';

packages/tracing/test/httpheaders.test.ts

@@ -3,14 +3,20 @@ import { API } from '@sentry/core';
 import { Hub } from '@sentry/hub';
 import { SentryRequest } from '@sentry/types';
 import * as utilsPackage from '@sentry/utils';
-import { base64ToUnicode } from '@sentry/utils';
+import { addBase64MethodsToCarrier, base64ToUnicode } from '@sentry/utils';
 
+// Note: yes, it's gross importing from another package by path rather than the real way, but the real way causes
+// circular dependency warnings, even though it's only for tests. See https://github.com/lerna/lerna/issues/1198.
+// @ts-ignore See above
+import { unsafeFromBase64, unsafeToBase64 } from '../../node/src/string';
 import { Span } from '../src/span';
 import { Transaction } from '../src/transaction';
 import { computeTracestateValue } from '../src/utils';
 
 // TODO gather sentry-trace and tracestate tests here
 
+addBase64MethodsToCarrier({ unsafeFromBase64, unsafeToBase64 });
+
 function parseEnvelopeRequest(request: SentryRequest): any {
   const [envelopeHeaderString, itemHeaderString, eventString] = request.body.split('\n');
 

packages/tracing/test/hub.test.ts

@@ -1,4 +1,9 @@
+/**
+ * @jest-environment ../../../.jest/dom-environment
+ */
+
 /* eslint-disable @typescript-eslint/unbound-method */
+
 import { BrowserClient } from '@sentry/browser';
 import { Hub } from '@sentry/hub';
 import * as hubModule from '@sentry/hub';

packages/tracing/test/span.test.ts

@@ -1,3 +1,7 @@
+/**
+ * @jest-environment ../../../.jest/dom-environment
+ */
+
 import { BrowserClient } from '@sentry/browser';
 import { Hub, Scope } from '@sentry/hub';
 import * as hubPackage from '@sentry/hub';

packages/utils/test/string.test.ts

@@ -1,5 +1,12 @@
+// Note: yes, it's gross importing from another package by path rather than the real way, but the real way causes
+// circular dependency warnings, even though it's only for tests. See https://github.com/lerna/lerna/issues/1198.
+// @ts-ignore See above
+import { unsafeFromBase64, unsafeToBase64 } from '../../node/src/string';
+import { addBase64MethodsToCarrier } from '../src/compat';
 import { base64ToUnicode, isMatchingPattern, truncate, unicodeToBase64 } from '../src/string';
 
+addBase64MethodsToCarrier({ unsafeFromBase64, unsafeToBase64 });
+
 // See https://tools.ietf.org/html/rfc4648#section-4 for base64 spec
 // eslint-disable-next-line no-useless-escape
 const BASE64_REGEX = /([a-zA-Z0-9+/]{4})*(|([a-zA-Z0-9+/]{3}=)|([a-zA-Z0-9+/]{2}==))/;