From 5679ed161c1b902c6109137818d740123a3579c9 Mon Sep 17 00:00:00 2001
From: Mike North <michael.l.north@gmail.com>
Date: Fri, 21 Sep 2018 16:38:26 -0700
Subject: [PATCH] [ember-data] fix failing tests on master

---
 types/ember-data/tsconfig.json | 2 ++
 types/ember/index.d.ts         | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/types/ember-data/tsconfig.json b/types/ember-data/tsconfig.json
index 9bdb160a16..9dc3623d26 100644
--- a/types/ember-data/tsconfig.json
+++ b/types/ember-data/tsconfig.json
@@ -16,6 +16,8 @@
         "paths": {
             "@ember/debug": ["ember__debug"],
             "@ember/debug/*": ["ember__debug/*"],
+            "@ember/array": ["ember__array"],
+            "@ember/array/*": ["ember__array/*"],
             "@ember/object": ["ember__object"],
             "@ember/object/*": ["ember__object/*"]
         },
diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 0899ab50a3..7765f89592 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -66,6 +66,7 @@ declare module 'ember' {
     // @ember/array
     import * as EmberArrayNs from '@ember/array';
     import EmberMutableArray from '@ember/array/mutable';
+    import EmberNativeArray from '@ember/array/-private/native-array';
     import EmberArrayProxy from '@ember/array/proxy';
     import EmberEnumerable from '@ember/array/-private/enumerable';
     import EmberArrayProtoExtensions from '@ember/array/types/prototype-extensions';
@@ -275,6 +276,10 @@ declare module 'ember' {
         class ArrayProxy<T> extends EmberArrayProxy<T> {}
         export type Array<T> = EmberArray<T>;
         export const Array: typeof EmberArrayNs.default;
+        export type MutableArray<T> = EmberMutableArray<T>;
+        export const MutableArray: typeof EmberMutableArray;
+        export type NativeArray<T> = EmberNativeArray<T>;
+        export const NativeArray: typeof EmberNativeArray;
         interface FunctionPrototypeExtensions {
             /**
              * The `property` extension of Javascript's Function prototype is available
@@ -772,7 +777,6 @@ declare module 'ember' {
             static create(): MapWithDefault;
         }
         class Mixin<T, Base = EmberObjectNs.default> extends EmberMixin<T, Base> {}
-        const MutableArray: typeof EmberMutableArray;
 
         /**
          * A Namespace is an object usually used to contain other objects or methods