[CLEANUP Beta] Drop Object.create playful – just use Object.create [E…

…S5-only] (╯°□°）╯︵ ʃıɟʎʃod ǝʇɐǝɹɔ ʇɔǝɾqo
emberjs · Jun 18, 2015 · 3f8df7a · 3f8df7a
1 parent be3caa4
commit 3f8df7a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 21 deletions.
diff --git a/packages/ember-application/tests/system/logging_test.js b/packages/ember-application/tests/system/logging_test.js
@@ -1,3 +1,5 @@
+/*globals EmberDev */
+
 import Ember from 'ember-metal/core';
 import run from 'ember-metal/run_loop';
 import Application from 'ember-application/system/application';
@@ -7,6 +9,8 @@ import Route from 'ember-routing/system/route';
 import RSVP from 'ember-runtime/ext/rsvp';
 import compile from 'ember-template-compiler/system/compile';
 
+import 'ember-routing';
+
 var App, logs, originalLogger;
 
 QUnit.module('Ember.Application – logging of generated classes', {

diff --git a/packages/ember-metal/tests/accessors/mandatory_setters_test.js b/packages/ember-metal/tests/accessors/mandatory_setters_test.js
@@ -114,7 +114,6 @@ if (isEnabled('mandatory-setter')) {
     });
 
     watch(obj, 'someProp');
-
     ok(!('someProp' in meta.values), 'blastix');
   });
 

diff --git a/packages/ember-runtime/lib/inject.js b/packages/ember-runtime/lib/inject.js
@@ -10,7 +10,7 @@ import InjectedProperty from 'ember-metal/injected_property';
   @public
 */
 export default function inject() {
-  Ember.assert(`Injected properties must be created through helpers, see '${Object.keys(inject).join("`, `")}'`);
+  Ember.assert(`Injected properties must be created through helpers, see '${Object.keys(inject).join('"', '"')}'`);
 }
 
 // Dictionary of injection validations by type, added to by `createInjectionHelper`

diff --git a/packages/ember-runtime/tests/computed/reduce_computed_test.js b/packages/ember-runtime/tests/computed/reduce_computed_test.js
@@ -56,7 +56,7 @@ QUnit.module('arrayComputed - [DEPRECATED]', {
           }
         }),
 
-        nestedNumbers:  Ember.A([1,2,3,4,5,6].map((n) => mberObject.create({ p: 'otherProperty', v: n }))),
+        nestedNumbers:  Ember.A([1,2,3,4,5,6].map((n) => EmberObject.create({ p: 'otherProperty', v: n }))),
 
         evenNestedNumbers: arrayComputed({
           addedItem(array, item, keyName) {
@@ -577,39 +577,23 @@ QUnit.test('recomputations from `arrayComputed` observers add back dependent key
 
   deepEqual(titles, ['Kingsguard', 'Queen'], 'precond - value is correct');
 
-<<<<<<< HEAD
   ok(meta.deps.people !== undefined, 'people has dependencies');
-  deepEqual(keys(meta.deps.people), ['titles'], 'only titles depends on people');
+  deepEqual(Object.keys(meta.deps.people), ['titles'], 'only titles depends on people');
   equal(meta.deps.people.titles, 1, 'titles depends on people exactly once');
   equal(meta.watching.people, 2, 'people has two watchers: the array listener and titles');
-=======
-  ok(meta.deps.people !== undefined, "people has dependencies");
-  deepEqual(Object.keys(meta.deps.people), ["titles"], "only titles depends on people");
-  equal(meta.deps.people.titles, 1, "titles depends on people exactly once");
-  equal(meta.watching.people, 2, "people has two watchers: the array listener and titles");
->>>>>>> [CLEANUP Beta] Remove EmberKeys (internally) continue to expose Ember.keys but as 1:1 with Object.keys [ES5-only]
 
   run(function() {
     set(obj, 'people', Ember.A());
   });
 
   // Regular CPs are invalidated when their dependent keys change, but array
   // computeds keep refs up to date
-<<<<<<< HEAD
   deepEqual(titles, [], 'value is correct');
   equal(meta.cache.titles, titles, 'value remains cached');
   ok(meta.deps.people !== undefined, 'people has dependencies');
-  deepEqual(keys(meta.deps.people), ['titles'], 'meta.deps.people is unchanged');
+  deepEqual(Object.keys(meta.deps.people), ['titles'], 'meta.deps.people is unchanged');
   equal(meta.deps.people.titles, 1, 'deps.people.titles is unchanged');
   equal(meta.watching.people, 2, 'watching.people is unchanged');
-=======
-  deepEqual(titles, [], "value is correct");
-  equal(meta.cache.titles, titles, "value remains cached");
-  ok(meta.deps.people !== undefined, "people has dependencies");
-  deepEqual(Object.keys(meta.deps.people), ["titles"], "meta.deps.people is unchanged");
-  equal(meta.deps.people.titles, 1, "deps.people.titles is unchanged");
-  equal(meta.watching.people, 2, "watching.people is unchanged");
->>>>>>> [CLEANUP Beta] Remove EmberKeys (internally) continue to expose Ember.keys but as 1:1 with Object.keys [ES5-only]
 });
 
 QUnit.module('Ember.arryComputed - self chains', {