most important tests are finished

izelnakri · Oct 29, 2017 · 14408cb · 14408cb
1 parent ff10ccd
commit 14408cb
Show file tree

Hide file tree

Showing 7 changed files with 256 additions and 120 deletions.
diff --git a/TODO b/TODO
@@ -1,4 +1,5 @@
 - create a cli
+- test that passthrough works, timing options work, coalasceFindRequestWorks, do the one throw()
 - derived schema attribute for $Model:
   schema: {
     inserted_at: {

diff --git a/lib/mem-server/model.js b/lib/mem-server/model.js
@@ -145,19 +145,25 @@ export default function(options) {
     },
     embedReferences: {},
     serializer(objectOrArray) {
-      if (Array.isArray(objectOrArray)) {
+      if (!objectOrArray) {
+        return;
+      } else if (Array.isArray(objectOrArray)) {
         return objectOrArray.map((object) => this.serialize(object), []);
       }
 
       return this.serialize(objectOrArray);
     },
     serialize(object) { // NOTE: add links object ?
+      if (Array.isArray(object)) {
+        throw new Error(chalk.red(`[MemServer] ${this.modelName}.serialize(object) expects an object not an array. Use ${this.modelName}.serializer(data) for serializing array of records`));
+      }
+
       const objectWithAllAttributes = this.attributes.reduce((result, attribute) => {
         if (result[attribute] === undefined) {
           result[attribute] = null;
         }
 
-        return object;
+        return result;
       }, object);
 
       return Object.keys(this.embedReferences).reduce((result, embedKey) => {

diff --git a/lib/mem-server/pretender-hacks.js b/lib/mem-server/pretender-hacks.js
@@ -17,7 +17,9 @@ window.Pretender.prototype._handlerFor = function(verb, url, request) {
     request.queryParams = Object.keys(matches.queryParams).reduce((result, key) => {
       var value = matches.queryParams[key];
 
-      return Object.assign(result, { [key]: parseInt(value, 10) || value });
+      const targetValue = castCorrectType(value); // NOTE: maybe to qs.parse() here?
+
+      return Object.assign(result, { [key]: targetValue });
     }, {});
 
     if (request.requestBody && request.requestHeaders['Content-Type'] === 'application/json') {
@@ -29,6 +31,18 @@ window.Pretender.prototype._handlerFor = function(verb, url, request) {
 
   return match;
 };
+
+function castCorrectType(value) {
+  if (parseInt(value, 10)) {
+    return parseInt(value, 10);
+  } else if (value === 'false') {
+    return false;
+  } else if (value === 'true') {
+    return true;
+  }
+
+  return value;
+}
 // END: Pretender Request Parameter Type Casting Hack
 
 // HACK START: Pretender Response Defaults UX Hack: Because Pretender Response types suck UX-wise.

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "license": "ISC",
   "scripts": {
-    "test": "mocha --retries 3"
+    "test": "sh run-tests.sh"
   },
   "repository": {
     "type": "git",

diff --git a/run-tests.sh b/run-tests.sh
@@ -0,0 +1,2 @@
+mocha --retries 3
+mocha ./test/server/mem-server.server.js
diff --git a/test/mem-server.model.serialize.js b/test/mem-server.model.serialize.js
@@ -108,7 +108,7 @@ describe('MemServer.Model Serialize Interface', function() {
     const photos = Photo.findAll({ is_public: false });
     const photoComments = PhotoComment.findAll({ photo_id: 1 });
 
-    assert.deepEqual(Photo.serialize(photos), [
+    assert.deepEqual(Photo.serializer(photos), [
       {
         id: 1,
         name: 'Ski trip',
@@ -122,7 +122,7 @@ describe('MemServer.Model Serialize Interface', function() {
         is_public: false
       }
     ]);
-    assert.deepEqual(PhotoComment.serialize(photoComments), [
+    assert.deepEqual(PhotoComment.serializer(photoComments), [
       {
         uuid: '499ec646-493f-4eea-b92e-e383d94182f4',
         content: 'What a nice photo!',
@@ -155,12 +155,16 @@ describe('MemServer.Model Serialize Interface', function() {
     const notFoundComment = PhotoComment.findBy({ uuid: '374c7f4a-85d6-429a-bf2a-0719525f5111' });
     const notFoundComments = Photo.findAll({ content: 'Aint easy' });
 
-    assert.equal(Photo.serialize(notFoundPhoto), undefined);
-    assert.deepEqual(Photo.serialize({}), {});
-    assert.deepEqual(Photo.serialize(notFoundPhotos), []);
-    assert.equal(PhotoComment.serialize(notFoundComment), undefined);
-    assert.deepEqual(PhotoComment.serialize({}), {});
-    assert.deepEqual(PhotoComment.serialize(notFoundComments), []);
+    assert.equal(Photo.serializer(notFoundPhoto), undefined);
+    assert.deepEqual(Photo.serializer({}), {
+      id: null, href: null, is_public: null, name: null
+    });
+    assert.deepEqual(Photo.serializer(notFoundPhotos), []);
+    assert.equal(PhotoComment.serializer(notFoundComment), undefined);
+    assert.deepEqual(PhotoComment.serializer({}), {
+      uuid: null, content: null, photo_id: null, user_id: null
+    });
+    assert.deepEqual(PhotoComment.serializer(notFoundComments), []);
   });
 
   it('can serialize embeded records recursively', function() {