chore: fix test compilation errors

Fixes some more test compilation issues after removing the `extendObject`.
angular · Nov 20, 2017 · 8a1f439 · 8a1f439
1 parent 05084e9
commit 8a1f439
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/lib/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
@@ -26,7 +26,7 @@ import {
   MatMenuItem,
 } from './index';
 import {MENU_PANEL_TOP_PADDING} from './menu-trigger';
-import {extendObject, MatRipple} from '@angular/material/core';
+import {MatRipple} from '@angular/material/core';
 import {
   dispatchKeyboardEvent,
   dispatchMouseEvent,
@@ -442,7 +442,7 @@ describe('MatMenu', () => {
 
       constructor(ctor: {new(): T; }, inputs: {[key: string]: any} = {}) {
         this.fixture = TestBed.createComponent(ctor);
-        extendObject(this.fixture.componentInstance, inputs);
+        Object.keys(inputs).forEach(key => this.fixture.componentInstance[key] = inputs[key]);
         this.fixture.detectChanges();
         this.trigger = this.fixture.componentInstance.triggerEl.nativeElement;
       }
@@ -453,7 +453,7 @@ describe('MatMenu', () => {
       }
 
       updateTriggerStyle(style: any) {
-        return extendObject(this.trigger.style, style);
+        return {...this.trigger.style, ...style};
       }
 
 

diff --git a/src/lib/select/select.spec.ts b/src/lib/select/select.spec.ts
@@ -40,7 +40,6 @@ import {
 } from '@angular/forms';
 import {
   ErrorStateMatcher,
-  extendObject,
   FloatPlaceholderType,
   MAT_PLACEHOLDER_GLOBAL_OPTIONS,
   MatOption,
@@ -3984,7 +3983,7 @@ class NgModelCompareWithSelect {
   compareByReference(f1: any, f2: any) { return f1 === f2; }
 
   setFoodByCopy(newValue: {value: string, viewValue: string}) {
-    this.selectedFood = extendObject({}, newValue);
+    this.selectedFood = {...{}, ...newValue};
   }
 }