[CLEANUP beta] Remove keys.js

emberjs · Oct 17, 2015 · b66a13f · b66a13f
1 parent 76e0089
commit b66a13f
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 181 deletions.
diff --git a/packages/ember-metal/lib/keys.js b/packages/ember-metal/lib/keys.js
diff --git a/packages/ember-metal/tests/keys_test.js b/packages/ember-metal/tests/keys_test.js
diff --git a/packages/ember-metal/tests/observer_test.js b/packages/ember-metal/tests/observer_test.js
@@ -1,4 +1,4 @@
-import Ember from 'ember-metal/core';
+import Ember, { K } from 'ember-metal/core';
 import { testBoth } from 'ember-metal/tests/props_helper';
 import {
   addObserver,
@@ -1097,3 +1097,72 @@ testBoth('observers added/removed during changeProperties should do the right th
   equal(removedAfterLastChangeObserver.willChangeCount, 1, '_removeBeforeObserver called after the last change still sees 1');
   equal(removedAfterLastChangeObserver.didChangeCount, 1, 'removeObserver called after the last change still sees 1');
 });
+
+
+QUnit.module('Keys behavior with observers');
+
+
+testBoth('should not leak properties on the prototype', function () {
+  function Beer() { }
+  Beer.prototype.type = 'ipa';
+
+  var beer = new Beer();
+
+  addObserver(beer, 'type', K);
+  deepEqual(Object.keys(beer), []);
+  removeObserver(beer, 'type', K);
+});
+
+testBoth('observing a non existent property', function (get, set) {
+  function Beer() { }
+  Beer.prototype.type = 'ipa';
+
+  var beer = new Beer();
+
+  addObserver(beer, 'brand', K);
+
+  deepEqual(Object.keys(beer), []);
+
+  set(beer, 'brand', 'Corona');
+  deepEqual(Object.keys(beer), ['brand']);
+
+  removeObserver(beer, 'brand', K);
+});
+
+testBoth('with observers switched on and off', function (get, set) {
+  function Beer() { }
+  Beer.prototype.type = 'ipa';
+
+  var beer = new Beer();
+
+  addObserver(beer, 'type', K);
+  removeObserver(beer, 'type', K);
+
+  deepEqual(Object.keys(beer), []);
+});
+
+testBoth('observers switched on and off with setter in between', function (get, set) {
+  function Beer() { }
+  Beer.prototype.type = 'ipa';
+
+  var beer = new Beer();
+
+  addObserver(beer, 'type', K);
+  set(beer, 'type', 'ale');
+  removeObserver(beer, 'type', K);
+
+  deepEqual(Object.keys(beer), ['type']);
+});
+
+testBoth('observer switched on and off and then setter', function (get, set) {
+  function Beer() { }
+  Beer.prototype.type = 'ipa';
+
+  var beer = new Beer();
+
+  addObserver(beer, 'type', K);
+  removeObserver(beer, 'type', K);
+  set(beer, 'type', 'ale');
+
+  deepEqual(Object.keys(beer), ['type']);
+});
diff --git a/packages/ember-routing/lib/system/router_state.js b/packages/ember-routing/lib/system/router_state.js
@@ -1,8 +1,9 @@
 import isEmpty from 'ember-metal/is_empty';
-import keys from 'ember-metal/keys';
 import EmberObject from 'ember-runtime/system/object';
 import assign from 'ember-metal/assign';
 
+const keys = Object.keys;
+
 var RouterState = EmberObject.extend({
   emberRouter: null,
   routerJs: null,

diff --git a/packages/ember/tests/component_registration_test.js b/packages/ember/tests/component_registration_test.js
@@ -1,6 +1,5 @@
 import Ember from 'ember-metal/core';
 import Controller from 'ember-runtime/controllers/controller';
-import keys from 'ember-metal/keys';
 import run from 'ember-metal/run_loop';
 
 import Application from 'ember-application/system/application';
@@ -14,6 +13,8 @@ import { A as emberA } from 'ember-runtime/system/native_array';
 var App, registry, container;
 var originalHelpers;
 
+const keys = Object.keys;
+
 function prepare() {
   Ember.TEMPLATES['components/expand-it'] = compile('<p>hello {{yield}}</p>');
   Ember.TEMPLATES.application = compile('Hello world {{#expand-it}}world{{/expand-it}}');