Related to #10

BlairAllegroTech · Jul 28, 2016 · 87fc330 · 87fc330
1 parent b4aa45f
commit 87fc330
Show file tree

Hide file tree

Showing 4 changed files with 126 additions and 92 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -56,14 +56,17 @@ module.exports = function (config) {
 
         // list of files / patterns to load in the browser
         files: [
+            // simple pattern to load the needed testfiles
+            // equal to {pattern: 'test/unit/*.spec.js', watched: true, served: true, included: true}
+
             'node_modules/es6-promise/dist/es6-promise.js',
             'node_modules/axios/dist/axios.js',
             'node_modules/js-data/dist/js-data.js',
             'node_modules/js-data-http/dist/js-data-http.js',
             'dist/js-data-jsonapi.js',
 
             'karma.start.js',
-            'test/**/*.js',
+            'test/*.js',
 
             'examples/**/*.js',
 

diff --git a/src/JsonApi.ts b/src/JsonApi.ts
@@ -147,13 +147,20 @@ export class JsonApiRelationship {
         }
     }
 
+
+
     WithData(type: string, id: string): JsonApiRelationship {
-        if (this.data && Array.isArray(this.data)) {
-            (<JsonApiData[]>this.data).push(new JsonApiData(type).WithId(id));
+
+        if (type && id) {
+            if (this.data && Array.isArray(this.data)) {
+                (<JsonApiData[]>this.data).push(new JsonApiData(type).WithId(id));
+            } else {
+                this.data = new JsonApiData(type).WithId(id);
+            }
+            return this;
         } else {
-            this.data = new JsonApiData(type).WithId(id);
+            throw new Error('Invalid call to "JsonApiRelationship.WithData" type and id required');
         }
-        return this;
     }
 
     AddLink(linkType: string, link: MetaLink): JsonApiRelationship {

diff --git a/src/JsonApiSerializer.ts b/src/JsonApiSerializer.ts
@@ -230,6 +230,7 @@ export class SerializationOptions {
      * @param localFieldName The local field name for the relationship, incase there is more than one relationship on the object of the given type
         */
     getChildRelationWithLocalField(relationType: string, localFieldName: string): JSData.RelationDefinition {
+
         relationType = relationType.toLowerCase();
         localFieldName = localFieldName.toLowerCase();