fix(relations): fixes hasMany and hasOne failing when inline property…

… is null.
platanus · Oct 24, 2015 · 05ab547 · 05ab547
1 parent 848c39f
commit 05ab547
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/module/extended/builder-relations.js b/src/module/extended/builder-relations.js
@@ -97,7 +97,7 @@ RMModule.factory('RMBuilderRelations', ['$injector', 'inflector', '$log', 'RMUti
       if(_source || _url) this.attrMap(_attr, _source || _url);
 
       this.attrDecoder(_attr, function(_raw) {
-            this[_attr].$reset().$decode(_raw);
+            this[_attr].$reset().$decode(_raw || []);
           })
           .attrMask(_attr, Utils.WRITE_MASK)
           .attrMeta(_attr, { relation: 'has_many' });
@@ -158,7 +158,7 @@ RMModule.factory('RMBuilderRelations', ['$injector', 'inflector', '$log', 'RMUti
       if(_source || _url) this.attrMap(_attr, _source || _url);
 
       this.attrDecoder(_attr, function(_raw) {
-            this[_attr].$decode(_raw);
+            this[_attr].$decode(_raw || {}); // TODO: null _raw should clear the object properties
           })
           .attrMask(_attr, Utils.WRITE_MASK)
           .attrMeta(_attr, { relation: 'has_one' });

diff --git a/test/relation-spec.js b/test/relation-spec.js
@@ -130,6 +130,11 @@ describe('Restmod model relation:', function() {
       expect(bike.activity.length).toEqual(2);
     });
 
+    it('should clear collection if inlined content is null', function() {
+      var bike = Bike.$new(1).$decode({ rides: null });
+      expect(bike.activity.length).toEqual(0);
+    });
+
     it('should reset collection content if new inline content is fed', function() {
       var bike = Bike.$new(1).$decode({ rides: [{ id: 1 }, { id: 2 }] });
       bike.$decode({ rides: [{ id: 3 }] });
@@ -213,6 +218,11 @@ describe('Restmod model relation:', function() {
       expect(bike.serialNo.value).toEqual('SERIAL');
     });
 
+    it('should do nothing if inline content is null', function() {
+      var bike = Bike.$new(1).$decode({ serial: null });
+      expect(bike.serialNo).not.toBeNull();
+    });
+
     it('should bubble child events to child type', function() {
       var spy = jasmine.createSpy();
       $injector.get('SerialNo').mix({