From 8d01ae24dd03e87982084db20fbad4d8aa78e304 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Fri, 12 May 2017 09:55:03 -0400 Subject: [PATCH] [BUGFIX beta] Ensure `Ember.deprecate` is exported properly. This fixes the reported issue (that `Ember.deprecate` was no longer being exported), and adds a test to confirm that it doesn't regress again in the future. --- packages/ember/lib/index.js | 1 + packages/ember/tests/reexports_test.js | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/ember/lib/index.js b/packages/ember/lib/index.js index 1bd30ea1d6d..c7108e71ee1 100644 --- 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 index bdfc2b80859..4ba1c398bee 100644 --- 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'],