From 67c6b11b3a2f58c76b8894db59aed41e4d3f9796 Mon Sep 17 00:00:00 2001
From: Mike North <michael.l.north@gmail.com>
Date: Fri, 21 Sep 2018 10:05:12 -0700
Subject: [PATCH] [ember] assert that Ember.ObjectProxy is an ObjectProxy

---
 types/ember/test/ember-module-tests.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/ember/test/ember-module-tests.ts b/types/ember/test/ember-module-tests.ts
index bad78e0aec..49ef08fb43 100644
--- a/types/ember/test/ember-module-tests.ts
+++ b/types/ember/test/ember-module-tests.ts
@@ -82,7 +82,6 @@ Ember.isPresent(''); // $ExpectType boolean
 Ember.isPresent([]); // $ExpectType boolean
 // merge
 Ember.merge({ a: 12 }, { b: 34 }).a; // $ExpectType number
-Ember.merge({}, {});
 // observer
 const o2 = EmberObject.extend({
     name: 'foo',
@@ -240,7 +239,7 @@ new Ember.NoneLocation();
 // Ember.Object
 new Ember.Object();
 // Ember.ObjectProxy
-new Ember.ObjectProxy();
+new Ember.ObjectProxy(); // $ExpectType ObjectProxy
 // Ember.Observable
 Ember.Object.extend(Ember.Observable, {});
 // Ember.PromiseProxyMixin