[BUGFIX beta] Fix get with empty string

emberjs · May 18, 2015 · ece32a5 · ece32a5
1 parent 003caee
commit ece32a5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/packages/ember-metal/lib/property_get.js b/packages/ember-metal/lib/property_get.js
@@ -11,6 +11,7 @@ import {
 } from "ember-metal/path_cache";
 import { hasPropertyAccessors } from "ember-metal/platform/define_property";
 import { symbol } from "ember-metal/utils";
+import isNone from 'ember-metal/is_none';
 
 var FIRST_KEY = /^([^\.]+)/;
 
@@ -62,7 +63,7 @@ export function get(obj, keyName) {
   Ember.assert(`Cannot call get with ${keyName} key.`, !!keyName);
   Ember.assert(`Cannot call get with '${keyName}' on an undefined object.`, obj !== undefined);
 
-  if (!obj) {
+  if (isNone(obj)) {
     return _getPath(obj, keyName);
   }
 

diff --git a/packages/ember-metal/tests/accessors/get_path_test.js b/packages/ember-metal/tests/accessors/get_path_test.js
@@ -17,6 +17,7 @@ var moduleOpts = {
         }
       },
       falseValue: false,
+      emptyString: '',
       Wuz: {
         nar: 'foo'
       }
@@ -79,6 +80,10 @@ QUnit.test('[obj, falseValue.notDefined] -> (undefined)', function() {
   equal(get(obj, 'falseValue.notDefined'), undefined);
 });
 
+QUnit.test('[obj, emptyString.length] -> 0', function() {
+  equal(get(obj, 'emptyString.length'), 0);
+});
+
 // ..........................................................
 // GLOBAL PATHS TREATED LOCAL WITH GET
 //