fix: Tests

HazAT · HazAT · commit fadb138d8663 · 2019-04-05T12:20:05.000+02:00
diff --git a/packages/core/test/lib/base.test.ts b/packages/core/test/lib/base.test.ts
@@ -1,42 +1,44 @@
 import { Hub, Scope } from '@sentry/hub';
 import { Event } from '@sentry/types';
-import { SentryError } from '@sentry/utils/error';
+import { SentryError } from '@sentry/utils';
 
 import { TestBackend } from '../mocks/backend';
 import { TestClient } from '../mocks/client';
 import { TestIntegration } from '../mocks/integration';
 
 const PUBLIC_DSN = 'https://username@domain/path';
 
-jest.mock('@sentry/utils/misc', () => ({
-  uuid4(): string {
-    return '42';
-  },
-  getGlobalObject(): object {
-    return {
-      console: {
-        log(): void {
-          // no-empty
+jest.mock('@sentry/utils', () => {
+  const original = require.requireActual('@sentry/utils');
+  return {
+    ...original,
+
+    uuid4(): string {
+      return '42';
+    },
+    getGlobalObject(): object {
+      return {
+        console: {
+          log(): void {
+            // no-empty
+          },
+          warn(): void {
+            // no-empty
+          },
+          error(): void {
+            // no-empty
+          },
         },
-        warn(): void {
-          // no-empty
-        },
-        error(): void {
-          // no-empty
-        },
-      },
-    };
-  },
-  consoleSandbox(cb: () => any): any {
-    return cb();
-  },
-}));
-
-jest.mock('@sentry/utils/string', () => ({
-  truncate(str: string): string {
-    return str;
-  },
-}));
+      };
+    },
+    consoleSandbox(cb: () => any): any {
+      return cb();
+    },
+    truncate(str: string): string {
+      return str;
+    },
+  };
+});
 
 describe('BaseClient', () => {
   beforeEach(() => {
diff --git a/packages/core/test/lib/dsn.test.ts b/packages/core/test/lib/dsn.test.ts
@@ -1,4 +1,4 @@
-import { SentryError } from '@sentry/utils/error';
+import { SentryError } from '@sentry/utils';
 
 import { Dsn } from '../../src/dsn';
 
diff --git a/packages/core/test/mocks/backend.ts b/packages/core/test/mocks/backend.ts
@@ -1,5 +1,5 @@
 import { Event, Options } from '@sentry/types';
-import { SyncPromise } from '@sentry/utils/syncpromise';
+import { SyncPromise } from '@sentry/utils';
 
 import { BaseBackend } from '../../src/basebackend';
 
diff --git a/packages/node/test/transports/http.test.ts b/packages/node/test/transports/http.test.ts
@@ -1,5 +1,5 @@
 import { TransportOptions } from '@sentry/types';
-import { SentryError } from '@sentry/utils/error';
+import { SentryError } from '@sentry/utils';
 import * as HttpsProxyAgent from 'https-proxy-agent';
 
 import { HTTPTransport } from '../../src/transports/http';
diff --git a/packages/node/test/transports/https.test.ts b/packages/node/test/transports/https.test.ts
@@ -1,5 +1,5 @@
 import { TransportOptions } from '@sentry/types';
-import { SentryError } from '@sentry/utils/error';
+import { SentryError } from '@sentry/utils';
 import * as HttpsProxyAgent from 'https-proxy-agent';
 
 import { HTTPSTransport } from '../../src/transports/https';
diff --git a/packages/utils/test/store.test.ts b/packages/utils/test/store.test.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { SentryError } from '@sentry/utils/error';`
	`1`	`+import { SentryError } from '@sentry/utils';`
`2`	`2`
`3`	`3`	`import { Dsn } from '../../src/dsn';`
`4`	`4`