Merge pull request #123 from StrahilKazlachev/fix/attribute/primary-p…

…roperty fix(syntax-interpreter): use the hyphenated name
aurelia · Feb 14, 2018 · 75c1e38 · 75c1e38
2 parents 6d7f6f2 + 4e4c427
commit 75c1e38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 19 deletions.
diff --git a/src/syntax-interpreter.js b/src/syntax-interpreter.js
@@ -191,7 +191,7 @@ export class SyntaxInterpreter {
   _getPrimaryPropertyName(resources, context) {
     let type = resources.getAttribute(context.attributeName);
     if (type && type.primaryProperty) {
-      return type.primaryProperty.name;
+      return type.primaryProperty.attribute;
     }
     return null;
   }

diff --git a/test/syntax-interpreter.spec.js b/test/syntax-interpreter.spec.js
@@ -273,7 +273,7 @@ describe('SyntaxInterpreter', () => {
       info.attrValue = "bar";
 
       spyOn(resources,'getAttribute').and.returnValue({
-        primaryProperty: { name: 'foo' }
+        primaryProperty: { attribute: 'foo' }
       });
 
       let instruction = interpreter.options(resources, null, info, null, { attributeName: 'foo' });
@@ -286,7 +286,7 @@ describe('SyntaxInterpreter', () => {
       info.attrValue = "bar;";
 
       spyOn(resources,'getAttribute').and.returnValue({
-        primaryProperty: { name: 'foo' }
+        primaryProperty: { attribute: 'foo' }
       });
 
       let instruction = interpreter.options(resources, null, info, null, { attributeName: 'foo' });
@@ -298,10 +298,6 @@ describe('SyntaxInterpreter', () => {
 
       info.attrValue = "foo: bar";
 
-      spyOn(resources,'getAttribute').and.returnValue({
-        primaryProperty: { name: 'foo' }
-      });
-
       let instruction = interpreter.options(resources, null, info, null, { attributeName: 'foo' });
       expect(instruction.attributes['foo']).toBe('bar');
     });
@@ -311,10 +307,6 @@ describe('SyntaxInterpreter', () => {
 
       info.attrValue = "foo: bar;";
 
-      spyOn(resources,'getAttribute').and.returnValue({
-        primaryProperty: { name: 'foo' }
-      });
-
       let instruction = interpreter.options(resources, null, info, null, { attributeName: 'foo' });
       expect(instruction.attributes['foo']).toBe('bar');
     });
@@ -324,10 +316,6 @@ describe('SyntaxInterpreter', () => {
 
       info.attrValue = "far: boo";
 
-      spyOn(resources,'getAttribute').and.returnValue({
-        primaryProperty: { name: 'foo' }
-      });
-
       let instruction = interpreter.options(resources, null, info, null, { attributeName: 'foo' });
       expect(instruction.attributes['far']).toBe('boo');
     });
@@ -337,10 +325,6 @@ describe('SyntaxInterpreter', () => {
 
       info.attrValue = "far: boo;";
 
-      spyOn(resources,'getAttribute').and.returnValue({
-        primaryProperty: { name: 'foo' }
-      });
-
       let instruction = interpreter.options(resources, null, info, null, { attributeName: 'foo' });
       expect(instruction.attributes['far']).toBe('boo');
     });