refactor(metadata): simplifies detection of empy var

stalniy · Mar 6, 2018 · afe64f2 · afe64f2
1 parent 4fd14e4
commit afe64f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/lib/metadata.js b/lib/metadata.js
@@ -56,13 +56,9 @@ class Metadata {
   }
 
   getVar(name) {
-    if (!this.values.hasOwnProperty(name)) {
+    if (!this.values.hasOwnProperty(name) && this.defs[name]) {
       this.hasValues = true;
-      if (this.defs[name] instanceof VariableMetadata) {
-        this.values[name] = this.defs[name].evaluate();
-      } else {
-        this.values[name] = undefined;
-      }
+      this.values[name] = this.defs[name].evaluate();
     }
 
     return this.values[name];

diff --git a/spec/interface_examples.js b/spec/interface_examples.js
@@ -28,8 +28,8 @@ sharedExamplesFor('Lazy Vars Interface', function(getVar) {
       expect(getVar('staticVar')).to.equal(value);
     });
 
-    it('returns undefined where there is no definition', () => {
-      expect(getVar('notDefined')).to.equal(undefined);
+    it('returns `undefined` where there is no definition', () => {
+      expect(getVar('notDefined')).to.be.undefined;
     });
 
     it('defines "get.variable" and its alias "get.definitionOf" getter builder', function() {