From f855b0ed2274abaa1abee14c7a6996047889b702 Mon Sep 17 00:00:00 2001
From: Dan Freeman <dfreeman@salsify.com>
Date: Tue, 29 May 2018 12:41:34 -0400
Subject: [PATCH] [ember] `initializer` and `instanceInitializer` are static
 methods

---
 types/ember/index.d.ts          |  4 ++--
 types/ember/test/application.ts | 20 +++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 0cae10cd24..91c45b94e7 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -1075,14 +1075,14 @@ declare module 'ember' {
              * after all initializers and therefore after all code is loaded and the app is
              * ready.
              */
-            initializer(initializer: Initializer<Engine>): void;
+            static initializer(initializer: Initializer<Engine>): void;
             /**
              * Instance initializers run after all initializers have run. Because
              * instance initializers run after the app is fully set up. We have access
              * to the store, container, and other items. However, these initializers run
              * after code has loaded and are not allowed to defer readiness.
              */
-            instanceInitializer(instanceInitializer: Initializer<EngineInstance>): void;
+            static instanceInitializer(instanceInitializer: Initializer<EngineInstance>): void;
             /**
              * Set this to provide an alternate class to `Ember.DefaultResolver`
              */
diff --git a/types/ember/test/application.ts b/types/ember/test/application.ts
index c2df458214..d0fc2e9c44 100755
--- a/types/ember/test/application.ts
+++ b/types/ember/test/application.ts
@@ -1,27 +1,33 @@
 import Ember from 'ember';
 import { assertType } from "./lib/assert";
 
-let App = Ember.Application.create({
-    customEvents: {
-        paste: 'paste'
-    }
+let BaseApp = Ember.Application.extend({
+    modulePrefix: 'my-app'
 });
 
-App.initializer({
+BaseApp.initializer({
     name: 'my-initializer',
     initialize(app) {
         app.register('foo:bar', Ember.Object.extend({ foo: 'bar' }));
     }
 });
 
-App.instanceInitializer({
+BaseApp.instanceInitializer({
     name: 'my-instance-initializer',
     initialize(app) {
         app.lookup('foo:bar').get('foo');
     }
 });
 
-let App2 = Ember.Application.create({
+let App1 = BaseApp.create({
+    rootElement: '#app-one',
+    customEvents: {
+        paste: 'paste'
+    }
+});
+
+let App2 = BaseApp.create({
+    rootElement: '#app-two',
     customEvents: {
         mouseenter: null,
         mouseleave: null