[BUGFIX release] Deprecate Freezable and frozenCopy. Resolves #11452

emberjs · Jul 16, 2015 · a11ee32 · a11ee32
1 parent 871cbd6
commit a11ee32
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 0 deletions.
diff --git a/packages/ember-runtime/lib/mixins/copyable.js b/packages/ember-runtime/lib/mixins/copyable.js
@@ -3,6 +3,7 @@
 @submodule ember-runtime
 */
 
+import Ember from 'ember-metal/core';
 import { get } from 'ember-metal/property_get';
 import { Mixin } from 'ember-metal/mixin';
 import { Freezable } from 'ember-runtime/mixins/freezable';
@@ -52,9 +53,11 @@ export default Mixin.create({
 
     @method frozenCopy
     @return {Object} copy of receiver or receiver
+    @deprecated Use `Object.freeze` instead.
     @private
   */
   frozenCopy() {
+    Ember.deprecate('`frozenCopy` is deprecated, use Object.freeze instead.');
     if (Freezable && Freezable.detect(this)) {
       return get(this, 'isFrozen') ? this : this.copy().freeze();
     } else {

diff --git a/packages/ember-runtime/lib/mixins/freezable.js b/packages/ember-runtime/lib/mixins/freezable.js
@@ -3,6 +3,7 @@
 @submodule ember-runtime
 */
 
+import Ember from 'ember-metal/core';
 import { Mixin } from 'ember-metal/mixin';
 import { get } from 'ember-metal/property_get';
 import { set } from 'ember-metal/property_set';
@@ -62,10 +63,16 @@ import { set } from 'ember-metal/property_set';
   @class Freezable
   @namespace Ember
   @since Ember 0.9
+  @deprecated Use `Object.freeze` instead.
   @private
 */
 export var Freezable = Mixin.create({
 
+  init() {
+    Ember.deprecate('`Ember.Freezable` is deprecated, use `Object.freeze` instead.');
+    this._super.apply(this, arguments);
+  },
+
   /**
     Set to `true` when the object is frozen. Use this property to detect
     whether your object is frozen or not.

diff --git a/packages/ember-runtime/tests/mixins/freezable_test.js b/packages/ember-runtime/tests/mixins/freezable_test.js
@@ -0,0 +1,9 @@
+import EmberObject from 'ember-runtime/system/object';
+import {Freezable} from 'ember-runtime/mixins/freezable';
+
+QUnit.module('Ember.Freezable');
+
+QUnit.test('should be deprecated', function() {
+  expectDeprecation('`Ember.Freezable` is deprecated, use `Object.freeze` instead.');
+  EmberObject.extend(Freezable).create();
+});
diff --git a/packages/ember-runtime/tests/suites/copyable/frozenCopy.js b/packages/ember-runtime/tests/suites/copyable/frozenCopy.js
@@ -11,6 +11,8 @@ suite.test('frozen objects should return same instance', function() {
 
   obj = this.newObject();
   if (get(this, 'shouldBeFreezable')) {
+    expectDeprecation('`frozenCopy` is deprecated, use Object.freeze instead.');
+
     ok(!Freezable || Freezable.detect(obj), 'object should be freezable');
 
     copy = obj.frozenCopy();