Skip to content

Commit

Permalink
[BUGFIX release] Deprecate Ember.create.
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanpenner authored and rwjblue committed Jun 21, 2015
1 parent 8ee36cb commit 501d473
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
3 changes: 2 additions & 1 deletion packages/ember-metal/lib/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
8 changes: 7 additions & 1 deletion packages/ember-metal/tests/main_test.js
Original file line number Diff line number Diff line change
@@ -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$/;
Expand Down Expand Up @@ -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');
});
2 changes: 1 addition & 1 deletion packages/ember-metal/tests/watching/watch_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down

0 comments on commit 501d473

Please sign in to comment.