big progress on Server tests

izelnakri · Oct 29, 2017 · ac5b491 · ac5b491
1 parent 13b9217
commit ac5b491
Show file tree

Hide file tree

Showing 6 changed files with 520 additions and 825 deletions.
diff --git a/lib/mem-server.js b/lib/mem-server.js
@@ -2,7 +2,6 @@ import fs from 'fs';
 import chalk from 'chalk';
 import stringUtils from 'ember-cli-string-utils';
 import { primaryKeyTypeSafetyCheck } from './mem-server/utils';
-import startServer from './mem-server/server';
 
 const inflect = require('i')(); // NOTE: make this ES6 import
 const ENVIRONMENT_IS_NODE = typeof global === 'object';
@@ -16,6 +15,8 @@ if (!fs.existsSync('memserver')) {
   throw new Error(chalk.red('/memserver/server.js doesn\'t exist for this directory!'));
 }
 
+import startServer from './mem-server/server';
+
 const modelFileNames = fs.readdirSync(`${process.cwd()}/memserver/models`);
 const targetNamespace = ENVIRONMENT_IS_NODE ? global : window;
 
@@ -26,7 +27,7 @@ targetNamespace.MemServer = {
   start(options={ logging: true }) {
     // scenario starts
     // configurations
-    
+
     this.DB = resetDatabase(this.Models);
     this.Server = startServer(options); // NOTE: maybe customize it here, make it shorter
 

diff --git a/lib/mem-server/pretender-hacks.js b/lib/mem-server/pretender-hacks.js
@@ -28,9 +28,11 @@ window.Pretender.prototype.handleRequest = function(request) {
   var path = request.url;
   var handler = this._handlerFor(verb, path, request);
 
+  console.log('HANDLER REQUST IS CALLED');
+  console.log('handler:');
+  console.log(handler);
   var _handleRequest = function(result) {
     var statusCode, headers, body;
-
     if (Array.isArray(result) && result.length === 3) {
       statusCode = result[0],
       headers = pretender.prepareHeaders(result[1]),
@@ -59,7 +61,7 @@ window.Pretender.prototype.handleRequest = function(request) {
     statusCode = getDefaultStatusCode(verb);
     headers = pretender.prepareHeaders({ 'Content-Type': 'application/json' });
     body = pretender.prepareBody(targetResult, headers);
-
+    console.log('UPCOMING RESPONSE PARAMS', statusCode, headers, body);
     pretender.handleResponse(request, async, function() {
       request.respond(statusCode, headers, body);
       pretender.handledRequest(verb, path, request);

diff --git a/lib/mem-server/server.js b/lib/mem-server/server.js
@@ -1,8 +1,20 @@
 import chalk from 'chalk';
 
-const Server = require(`${process.cwd()}/memserver/server`).default; // NOTE: make this ES6 import
-
 export default function(options) {
+  const Server = require(`${process.cwd()}/memserver/server`).default; // NOTE: make this ES6 import
+
+  // HACK: Pretender REST defaults hack: For better UX
+  ['get', 'put', 'post', 'delete'].forEach((verb) => {
+    window.Pretender.prototype[verb] = function (path, handler, async) {
+      const { urlPrefix, namespace } = options; // NOTE: this doesnt allow for this.namespace declaration in the server.js
+      const fullPath = (urlPrefix || '') + (namespace ? ('/' + namespace) : '') + path;
+      const targetHandler = handler || getDefaultRouteHandler(verb, fullPath);
+
+      return this.register(verb.toUpperCase(), fullPath, targetHandler, async || options.timing);
+    }
+  });
+  // END: Pretender REST default hack: FOr better UX
+
   let pretender = new window.Pretender(function() {
     const MemServer = chalk.cyan('[MemServer]');
 
@@ -23,18 +35,6 @@ export default function(options) {
     }
   });
 
-  // HACK: Pretender REST defaults hack: For better UX
-  ['get', 'put', 'post', 'delete'].forEach((verb) => {
-    window.Pretender.prototype[verb] = function (path, handler, async) {
-      const { urlPrefix, namespace } = options; // NOTE: this doesnt allow for this.namespace declaration in the server.js
-      const fullPath = (urlPrefix || '') + (namespace ? ('/' + namespace) : '') + path;
-      const targetHandler = handler || getDefaultRouteHandler(verb, fullPath);
-
-      return this.register(verb, fullPath, targetHandler, async || options.timing);
-    }
-  });
-  // END: Pretender REST default hack: FOr better UX
-
   // NOTE: maybe passthrough() api here
   // NOTE: maybe this.resource()
 

diff --git a/package.json b/package.json
@@ -25,7 +25,6 @@
     "route-recognizer": "^0.3.3"
   },
   "devDependencies": {
-    "chai": "^4.1.2",
     "faker": "^4.1.0",
     "jquery": "^3.2.1",
     "mkdirp": "^0.5.1",