chore(): resolve merge conflicts

angular/test/test-app/src/app/modal/modal.component.ts

@@ -27,6 +27,7 @@ export class ModalComponent {
   async open(TheModalComponent: any) {
     const modal = await this.modalCtrl.create({
       component: TheModalComponent,
+      animated: false,
       componentProps: {
         value: '123',
         prop: '321'
@@ -40,7 +41,7 @@ export class ModalComponent {
     modal.onDidDismiss().then(() => {
       NgZone.assertInAngularZone();
       if (!this.onWillDismiss) {
-        throw new Error('onWillDismiss should be emited first');
+        throw new Error('onWillDismiss should be emitted first');
       }
       this.onDidDismiss = true;
     });

angular/test/test-app/src/test.ts

@@ -1,20 +0,0 @@
-// This file is required by karma.conf.js and loads recursively all the .spec and framework files
-
-import 'zone.js/dist/zone-testing';
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
-} from '@angular/platform-browser-dynamic/testing';
-
-declare const require: any;
-
-// First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
-);
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);