ref: Code Review

Author: HazAT

packages/apm/test/hub.test.ts

@@ -11,28 +11,6 @@ describe('Hub', () => {
     jest.useRealTimers();
   });
 
-  describe('getTransaction', () => {
-    test('simple invoke', () => {
-      const hub = new Hub(new BrowserClient({ tracesSampleRate: 1 }));
-      const transaction = hub.startTransaction({ name: 'foo' });
-      hub.configureScope(scope => {
-        scope.setSpan(transaction);
-      });
-      hub.configureScope(s => {
-        expect(s.getTransaction()).toBe(transaction);
-      });
-    });
-
-    test('not invoke', () => {
-      const hub = new Hub(new BrowserClient({ tracesSampleRate: 1 }));
-      const transaction = hub.startTransaction({ name: 'foo' });
-      hub.configureScope(s => {
-        expect(s.getTransaction()).toBeUndefined();
-      });
-      transaction.finish();
-    });
-  });
-
   describe('spans', () => {
     describe('sampling', () => {
       test('set tracesSampleRate 0 on span', () => {

packages/apm/test/scope.test.ts

@@ -0,0 +1,35 @@
+import { BrowserClient } from '@sentry/browser';
+import { Hub } from '@sentry/hub';
+
+import { addExtensionMethods } from '../src/hubextensions';
+
+addExtensionMethods();
+
+describe('Scope', () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+    jest.useRealTimers();
+  });
+
+  describe('getTransaction', () => {
+    test('simple invoke', () => {
+      const hub = new Hub(new BrowserClient({ tracesSampleRate: 1 }));
+      const transaction = hub.startTransaction({ name: 'foo' });
+      hub.configureScope(scope => {
+        scope.setSpan(transaction);
+      });
+      hub.configureScope(s => {
+        expect(s.getTransaction()).toBe(transaction);
+      });
+    });
+
+    test('not invoke', () => {
+      const hub = new Hub(new BrowserClient({ tracesSampleRate: 1 }));
+      const transaction = hub.startTransaction({ name: 'foo' });
+      hub.configureScope(s => {
+        expect(s.getTransaction()).toBeUndefined();
+      });
+      transaction.finish();
+    });
+  });
+});

packages/hub/src/scope.ts

@@ -230,10 +230,8 @@ export class Scope implements ScopeInterface {
    */
   public getTransaction(): Transaction | undefined {
     const span = this.getSpan() as Span & { spanRecorder: { spans: Span[] } };
-    if (span) {
-      if (span.spanRecorder && span.spanRecorder.spans[0]) {
-        return span.spanRecorder.spans[0] as Transaction;
-      }
+    if (span && span.spanRecorder && span.spanRecorder.spans[0]) {
+      return span.spanRecorder.spans[0] as Transaction;
     }
     return undefined;
   }