Merge pull request #15239 from rwjblue/fix-deprecate

[BUGFIX beta] Ensure `Ember.deprecate` is exported properly.
emberjs · May 12, 2017 · b02f99d · b02f99d
2 parents fdd1bcc + 8d01ae2
commit b02f99d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/ember/lib/index.js b/packages/ember/lib/index.js
@@ -45,6 +45,7 @@ Ember.cacheFor = metal.cacheFor;
 Ember.assert = EmberDebug.assert;
 Ember.warn = EmberDebug.warn;
 Ember.debug = EmberDebug.debug;
+Ember.deprecate = EmberDebug.deprecate;
 Ember.deprecateFunc = EmberDebug.deprecateFunc;
 Ember.runInDebug = EmberDebug.runInDebug;
 /**

diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
@@ -27,16 +27,19 @@ QUnit.module('ember reexports');
   ['Registry', 'container', 'Registry'],
   ['Container', 'container', 'Container'],
 
-  // ember-metal
-  ['computed', 'ember-metal'],
-  ['computed.alias', 'ember-metal', 'alias'],
-  ['ComputedProperty', 'ember-metal'],
-  ['cacheFor', 'ember-metal'],
+  // ember-debug
   ['deprecateFunc', 'ember-debug'],
+  ['deprecate', 'ember-debug'],
   ['assert', 'ember-debug'],
   ['warn', 'ember-debug'],
   ['debug', 'ember-debug'],
   ['runInDebug', 'ember-debug'],
+
+  // ember-metal
+  ['computed', 'ember-metal'],
+  ['computed.alias', 'ember-metal', 'alias'],
+  ['ComputedProperty', 'ember-metal'],
+  ['cacheFor', 'ember-metal'],
   ['merge', 'ember-metal'],
   ['instrument', 'ember-metal'],
   ['Instrumentation.instrument', 'ember-metal', 'instrument'],