Merge remote-tracking branch 'origin/master' into Merge-Move-adapter-…

…code-to-fortune Conflicts: package.json test/all.js test/app.js test/fixtures.json
flyvictor · Jun 5, 2014 · a42fe4a · a42fe4a
1 parent 8eb32ae
commit a42fe4a
Show file tree

Hide file tree

Showing 9 changed files with 742 additions and 1,466 deletions.
diff --git a/test/all.js b/test/all.js
diff --git a/test/fortune-mongodb/mongodb.spec.js b/test/fortune-mongodb/mongodb.spec.js
@@ -112,7 +112,10 @@ module.exports = function(options){
         it('should return all existing fields when no select is specified', function(done){
           adapter.findMany('person')
             .then(function(docs){
-              (Object.keys(docs[0]).length).should.equal(4);
+              //hooks add their black magic here.
+              //See what you have in fixtures + what beforeWrite hooks assign in addiction
+              var keys = Object.keys(docs[0]).length;
+              (keys).should.equal(6);
               done();
             });
         });
@@ -167,7 +170,9 @@ module.exports = function(options){
         it('should return all existing fields when no select is specified', function(done){
           adapter.find('person', ids.people[0])
             .then(function(doc){
-              (Object.keys(doc).length).should.equal(4);
+              //hooks add their black magic here.
+              //See what you have in fixtures + what beforeWrite hooks assign in addiction
+              (Object.keys(doc).length).should.equal(6);
               done();
             });
         });

diff --git a/test/fortune/all.js b/test/fortune/all.js
@@ -21,6 +21,8 @@ describe('Fortune', function () {
   require('./associations')(options);
   require('./fields_and_filters')(options);
   require('./compound_document')(options);
+  require('./documents_with_links')(options);
+  require('./includes')(options);
 
   describe("Business key", function(){
     it("can be used as primary key for individual resource requests", function(done){

diff --git a/test/fortune/associations.js b/test/fortune/associations.js
@@ -204,6 +204,34 @@ module.exports = function(options){
               });
           });
       });
+      it('should update association on PATCH', function(done){
+        new Promise(function(resolve){
+          var patch = [{
+            op: 'replace',
+            path: '/people/0/soulmate',
+            value: ids.people[2]
+          }];
+          request(baseUrl).patch('/people/' + ids.people[0])
+            .set('Content-Type', 'application/json')
+            .send(JSON.stringify(patch))
+            .expect(200)
+            .end(function(err, res){
+              should.not.exist(err);
+              var body = JSON.parse(res.text);
+              (body.people[0].links.soulmate).should.equal(ids.people[2]);
+              resolve();
+            });
+        }).then(function(){
+            request(baseUrl).get('/people/' + ids.people[2])
+              .expect(200)
+              .end(function(err, res){
+                should.not.exist(err);
+                var body = JSON.parse(res.text);
+                (body.people[0].links.soulmate).should.equal(ids.people[0]);
+                done();
+              });
+          });
+      });
     });
 
     describe('many to many association', function() {

diff --git a/test/fortune/compound_document.js b/test/fortune/compound_document.js
@@ -215,7 +215,7 @@ module.exports = function(options){
         });
     });
 
-
+    //TODO: empty suite
     it("should append links for external references", function(done){
       request(baseUrl)
         .get("/people/" + ids.people[0] + "?include=cars,cars.MOT")