If defined, include jQuery.ajaxSetup data in REST parameters

gwak · Sep 21, 2010 · c15f1cc · c15f1cc
1 parent 8d13519
commit c15f1cc
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/src/model_rest.js b/src/model_rest.js
@@ -46,6 +46,9 @@ Model.REST = function(resource, methods) {
       } else {
         params = null;
       }
+      if(jQuery.ajaxSettings.data){
+        params = jQuery.extend(jQuery.ajaxSettings.data, params || {});
+      }
       return JSON.stringify(params)
     },
 

diff --git a/test/tests/model_rest.js b/test/tests/model_rest.js
@@ -168,6 +168,37 @@ test("create failure", function() {
   });
 });
 
+test("create with AjaxSetup", function() {
+
+  jQuery.ajaxSetup({
+    data: {
+      socket_id: '111'
+    }
+  })
+
+  var Post = Model("post", {
+    persistence: Model.REST("/posts")
+  });
+  var post = new Post({ title: "Foo", body: "..." });
+
+  equals(Post.count(), 0);
+
+  AjaxSpy.start();
+
+  stop();
+
+  post.save(function(success) {
+    ok(success);
+    same(this, post);
+    start();
+  });
+
+  equals(AjaxSpy.requests.length, 1, "one request should have been made");
+
+  var request = AjaxSpy.requests.shift();
+  same(JSON.parse(request.data), { socket_id: '111', post: { title: "Foo", body: "..." } });
+});
+
 test("update", function() {
   var Post = Model("post", {
     persistence: Model.REST("/posts")