Merge remote-tracking branch 'upstream/master' into feat/move-hub

Author: timfish

packages/angular/.eslintrc.js

@@ -3,4 +3,5 @@ module.exports = {
     browser: true,
   },
   extends: ['../../.eslintrc.js'],
+  ignorePatterns: ['setup-jest.ts'],
 };

packages/angular/jest.config.js

@@ -3,4 +3,5 @@ const baseConfig = require('../../jest/jest.config.js');
 module.exports = {
   ...baseConfig,
   testEnvironment: 'jsdom',
+  setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
 };

packages/angular/package.json

@@ -33,9 +33,12 @@
     "@angular/compiler": "^10.2.5",
     "@angular/compiler-cli": "~10.2.5",
     "@angular/core": "~10.2.5",
+    "@angular/platform-browser": "~10.2.5",
+    "@angular/platform-browser-dynamic": "~10.2.5",
     "@angular/router": "~10.2.5",
     "ng-packagr": "^10.1.0",
-    "typescript": "~4.0.2"
+    "typescript": "~4.0.2",
+    "zone.js": "^0.11.8"
   },
   "scripts": {
     "build": "yarn build:ngc",

packages/angular/setup-jest.ts

@@ -0,0 +1,7 @@
+import 'zone.js';
+
+import { TestBed } from '@angular/core/testing';
+import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
+
+TestBed.resetTestEnvironment();
+TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());

packages/angular/test/errorhandler.test.ts

@@ -121,4 +121,28 @@ describe('SentryErrorHandler', () => {
       expect.any(Function),
     );
   });
+
+  it('handleError method shows report dialog', () => {
+    const showReportDialogSpy = jest.spyOn(SentryBrowser, 'showReportDialog');
+
+    const errorHandler = createErrorHandler({ showDialog: true });
+    errorHandler.handleError(new Error('test'));
+
+    expect(showReportDialogSpy).toBeCalledTimes(1);
+  });
+
+  it('handleError method extracts error with a custom extractor', () => {
+    const customExtractor = (error: unknown) => {
+      if (typeof error === 'string') {
+        return new Error(`custom ${error}`);
+      }
+      return error;
+    };
+
+    const errorHandler = createErrorHandler({ extractor: customExtractor });
+    errorHandler.handleError('error');
+
+    expect(captureExceptionSpy).toHaveBeenCalledTimes(1);
+    expect(captureExceptionSpy).toHaveBeenCalledWith(new Error('custom error'), expect.any(Function));
+  });
 });