Fixed bug so that request data is always passed as an already parsed …

…object.
hinthealth · Jan 19, 2015 · fc2fcf3 · fc2fcf3
1 parent 1345726
commit fc2fcf3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "facade",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "authors": [
     "Blake West <[email protected]>"
   ],

diff --git a/dist/facade.js b/dist/facade.js
@@ -294,7 +294,7 @@ var Y=s();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(G.
     throwIfRegex(opts.route);
     var fullUrl = opts.resource.url + '/' + opts.item.id + opts.route;
     Facade.backend.when(opts.method, fullUrl).respond(function(method, url, requestData, headers) {
-      requestData = requestData || {};
+      requestData = JSON.parse(requestData || "{}");
       var route = Facade.findRoute(method, url);
       var item = getTable(opts.resource).find(opts.item.id);
 
@@ -310,7 +310,7 @@ var Y=s();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(G.
   function createCustomRouteForCollection(opts) {
     var fullUrl = _.isRegExp(opts.route) ? opts.route : opts.resource.url + opts.route
     Facade.backend.when(opts.method, fullUrl).respond(function(method, url, requestData, headers) {
-      requestData = requestData || {};
+      requestData = JSON.parse(requestData || "{}");
       var collection = getTable(opts.resource).getAll();
       var route = Facade.findRoute(method, url);
 
@@ -327,7 +327,7 @@ var Y=s();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(G.
     var fullUrl = opts.resource.url + opts.route;
     Facade.backend.expect(opts.method, fullUrl, withJSON(opts.expected))
       .respond(function(method, url, requestData, headers) {
-        requestData = requestData || {};
+        requestData = JSON.parse(requestData || "{}");
         var collection = getTable(opts.resource).getAll();
         var route = Facade.findRoute(method, url);
 

diff --git a/dist/facade.min.js b/dist/facade.min.js
diff --git a/src/facade.js b/src/facade.js
@@ -238,7 +238,7 @@
     throwIfRegex(opts.route);
     var fullUrl = opts.resource.url + '/' + opts.item.id + opts.route;
     Facade.backend.when(opts.method, fullUrl).respond(function(method, url, requestData, headers) {
-      requestData = requestData || {};
+      requestData = JSON.parse(requestData || "{}");
       var route = Facade.findRoute(method, url);
       var item = getTable(opts.resource).find(opts.item.id);
 
@@ -254,7 +254,7 @@
   function createCustomRouteForCollection(opts) {
     var fullUrl = _.isRegExp(opts.route) ? opts.route : opts.resource.url + opts.route
     Facade.backend.when(opts.method, fullUrl).respond(function(method, url, requestData, headers) {
-      requestData = requestData || {};
+      requestData = JSON.parse(requestData || "{}");
       var collection = getTable(opts.resource).getAll();
       var route = Facade.findRoute(method, url);
 
@@ -271,7 +271,7 @@
     var fullUrl = opts.resource.url + opts.route;
     Facade.backend.expect(opts.method, fullUrl, withJSON(opts.expected))
       .respond(function(method, url, requestData, headers) {
-        requestData = requestData || {};
+        requestData = JSON.parse(requestData || "{}");
         var collection = getTable(opts.resource).getAll();
         var route = Facade.findRoute(method, url);
 

diff --git a/test/test.js b/test/test.js
@@ -269,17 +269,17 @@
   });
   describe("the Resource object", function() {
     describe("#addItem", function() {
-      var patientResource;
+      var patientResource, patient1;
       beforeEach(function() {
         patientResource = Facade.resource({
           name: "patient",
           url: "/api/provider/patients"
         });
         createController();
         Facade.initialize({backend: $httpBackend});
+        patient1 = patientResource.addItem({id: 1, name: "Joe Bob"});
       });
       it("should take an object and add it to the database for that resource", function() {
-        patientResource.addItem({id: 1, name: "Joe Bob"});
         Facade.db.patient.find(1).should.eql({id: 1, name: "Joe Bob"});
       });
       it("should auto add rest routes for that patient", function() {