fix: Install integrations when SDK is enabled (getsentry#2193)

kamilogorek · web-flow · commit d2cff1aa1d93 · 2019-08-08T11:35:03.000+02:00
diff --git a/packages/core/src/baseclient.ts b/packages/core/src/baseclient.ts
@@ -72,7 +72,7 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement
       this._dsn = new Dsn(options.dsn);
     }
 
-    if (!options.enabled) {
+    if (this._isEnabled()) {
       this._integrations = setupIntegrations(this._options);
     }
   }
diff --git a/packages/core/test/lib/base.test.ts b/packages/core/test/lib/base.test.ts
@@ -426,6 +426,26 @@ describe('BaseClient', () => {
       expect(Object.keys(client.getIntegrations()).length).toBe(1);
       expect(client.getIntegration(TestIntegration)).toBeTruthy();
     });
+
+    test('skips installation if DSN is not provided', () => {
+      expect.assertions(2);
+      const client = new TestClient({
+        integrations: [new TestIntegration()],
+      });
+      expect(Object.keys(client.getIntegrations()).length).toBe(0);
+      expect(client.getIntegration(TestIntegration)).toBeFalsy();
+    });
+
+    test('skips installation if enabled is set to false', () => {
+      expect.assertions(2);
+      const client = new TestClient({
+        dsn: PUBLIC_DSN,
+        enabled: false,
+        integrations: [new TestIntegration()],
+      });
+      expect(Object.keys(client.getIntegrations()).length).toBe(0);
+      expect(client.getIntegration(TestIntegration)).toBeFalsy();
+    });
   });
 
   describe('flush/close', () => {
diff --git a/packages/core/test/lib/sdk.test.ts b/packages/core/test/lib/sdk.test.ts
@@ -6,6 +6,8 @@ import { TestClient } from '../mocks/client';
 
 declare var global: any;
 
+const PUBLIC_DSN = 'https://username@domain/path';
+
 jest.mock('@sentry/hub', () => ({
   getCurrentHub(): {
     bindClient(): boolean;
@@ -42,7 +44,7 @@ describe('SDK', () => {
         new MockIntegration('MockIntegration 1'),
         new MockIntegration('MockIntegration 2'),
       ];
-      initAndBind(TestClient, { defaultIntegrations: DEFAULT_INTEGRATIONS });
+      initAndBind(TestClient, { dsn: PUBLIC_DSN, defaultIntegrations: DEFAULT_INTEGRATIONS });
       expect((DEFAULT_INTEGRATIONS[0].setupOnce as jest.Mock).mock.calls.length).toBe(1);
       expect((DEFAULT_INTEGRATIONS[1].setupOnce as jest.Mock).mock.calls.length).toBe(1);
     });
@@ -52,7 +54,7 @@ describe('SDK', () => {
         new MockIntegration('MockIntegration 1'),
         new MockIntegration('MockIntegration 2'),
       ];
-      initAndBind(TestClient, { defaultIntegrations: false });
+      initAndBind(TestClient, { dsn: PUBLIC_DSN, defaultIntegrations: false });
       expect((DEFAULT_INTEGRATIONS[0].setupOnce as jest.Mock).mock.calls.length).toBe(0);
       expect((DEFAULT_INTEGRATIONS[1].setupOnce as jest.Mock).mock.calls.length).toBe(0);
     });
@@ -62,7 +64,7 @@ describe('SDK', () => {
         new MockIntegration('MockIntegration 1'),
         new MockIntegration('MockIntegration 2'),
       ];
-      initAndBind(TestClient, { integrations });
+      initAndBind(TestClient, { dsn: PUBLIC_DSN, integrations });
       expect((integrations[0].setupOnce as jest.Mock).mock.calls.length).toBe(1);
       expect((integrations[1].setupOnce as jest.Mock).mock.calls.length).toBe(1);
     });
@@ -76,7 +78,7 @@ describe('SDK', () => {
         new MockIntegration('MockIntegration 1'),
         new MockIntegration('MockIntegration 3'),
       ];
-      initAndBind(TestClient, { defaultIntegrations: DEFAULT_INTEGRATIONS, integrations });
+      initAndBind(TestClient, { dsn: PUBLIC_DSN, defaultIntegrations: DEFAULT_INTEGRATIONS, integrations });
       // 'MockIntegration 1' should be overridden by the one with the same name provided through options
       expect((DEFAULT_INTEGRATIONS[0].setupOnce as jest.Mock).mock.calls.length).toBe(0);
       expect((DEFAULT_INTEGRATIONS[1].setupOnce as jest.Mock).mock.calls.length).toBe(1);
@@ -91,6 +93,7 @@ describe('SDK', () => {
       ];
       const newIntegration = new MockIntegration('MockIntegration 3');
       initAndBind(TestClient, {
+        dsn: PUBLIC_DSN,
         // Take only the first one and add a new one to it
         defaultIntegrations: DEFAULT_INTEGRATIONS,
         integrations: (integrations: Integration[]) => integrations.slice(0, 1).concat(newIntegration),

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement`
`72`	`72`	`this._dsn = new Dsn(options.dsn);`
`73`	`73`	`}`
`74`	`74`
`75`		`- if (!options.enabled) {`
	`75`	`+ if (this._isEnabled()) {`
`76`	`76`	`this._integrations = setupIntegrations(this._options);`
`77`	`77`	`}`
`78`	`78`	`}`