diff --git a/packages/ember-metal/lib/main.js b/packages/ember-metal/lib/main.js index 278c083cb5e..5a245ca34e8 100644 --- a/packages/ember-metal/lib/main.js +++ b/packages/ember-metal/lib/main.js @@ -223,7 +223,6 @@ Ember._Cache = Cache; Ember.generateGuid = generateGuid; Ember.GUID_KEY = GUID_KEY; -Ember.create = Object.create; Ember.keys = Object.keys; Ember.platform = { defineProperty: true, @@ -408,4 +407,6 @@ if (Ember.__loader.registry['ember-debug']) { requireModule('ember-debug'); } +Ember.create = Ember.deprecateFunc('Ember.create is deprecated in-favour of Object.create', Object.create); + export default Ember; diff --git a/packages/ember-metal/tests/main_test.js b/packages/ember-metal/tests/main_test.js index e2aeb33f27a..e79bc889b70 100644 --- a/packages/ember-metal/tests/main_test.js +++ b/packages/ember-metal/tests/main_test.js @@ -1,4 +1,4 @@ -import Ember from 'ember-metal/core'; +import Ember from 'ember-metal'; // From sindresourhus/semver-regex https://github.com/sindresorhus/semver-regex/blob/795b05628d96597ebcbe6d31ef4a432858365582/index.js#L3 var SEMVER_REGEX = /^\bv?(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)(?:-[\da-z\-]+(?:\.[\da-z\-]+)*)?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?\b$/; @@ -32,3 +32,9 @@ QUnit.test('SEMVER_REGEX properly validates and invalidates version numbers', fu validateVersionString('1.11', false); }); + +QUnit.test('Ember.create is deprecated', function() { + expectDeprecation(function() { + Ember.create(null); + }, 'Ember.create is deprecated in-favour of Object.create'); +}); diff --git a/packages/ember-metal/tests/watching/watch_test.js b/packages/ember-metal/tests/watching/watch_test.js index 692b3c7e089..c6aea444f39 100644 --- a/packages/ember-metal/tests/watching/watch_test.js +++ b/packages/ember-metal/tests/watching/watch_test.js @@ -92,7 +92,7 @@ testBoth('watching a regular undefined property', function(get, set) { testBoth('watches should inherit', function(get, set) { var obj = { foo: 'baz' }; - var objB = Ember.create(obj); + var objB = Object.create(obj); addListeners(obj, 'foo'); watch(obj, 'foo');