sharedb-mongo 1.0.0-beta.6 → 1.0.0

package/test/test_mongo.js

@@ -1,21 +1,19 @@
-var expect = require('expect.js');
-var mongodb = require('mongodb');
-var ShareDbMongo = require('../index');
+var expect = require('chai').expect;
+var ShareDbMongo = require('..');
 var getQuery = require('sharedb-mingo-memory/get-query');
+var async = require('async');
 
 var mongoUrl = process.env.TEST_MONGO_URL || 'mongodb://localhost:27017/test';
 
 function create(callback) {
-  var db = ShareDbMongo({mongo: function(shareDbCallback) {
-    mongodb.connect(mongoUrl, function(err, mongo) {
+  var db = new ShareDbMongo(mongoUrl);
+  db.getDbs(function(err, mongo) {
+    if (err) return callback(err);
+    mongo.dropDatabase(function(err) {
       if (err) return callback(err);
-      mongo.dropDatabase(function(err) {
-        if (err) return callback(err);
-        shareDbCallback(null, mongo);
-        callback(null, db, mongo);
-      });
+      callback(null, db, mongo);
     });
-  }});
+  });
 };
 
 require('sharedb/test/db')({create: create, getQuery: getQuery});
@@ -43,10 +41,10 @@ describe('mongo db', function() {
         mongo.collection('o_testcollection').indexInformation(function(err, indexes) {
           if (err) return done(err);
           // Index for getting document(s) ops
-          expect(indexes['d_1_v_1']).ok();
+          expect(indexes['d_1_v_1']).ok;
           // Index for checking committed op(s) by src and seq
-          expect(indexes['src_1_seq_1_v_1']).ok();
-          done()
+          expect(indexes['src_1_seq_1_v_1']).ok;
+          done();
         });
       });
     });
@@ -55,9 +53,9 @@ describe('mongo db', function() {
       var db = this.db;
       this.mongo.collection('testcollection').createIndex({x: 1}, {unique: true}, function(err) {
         if (err) return done(err);
-        db.commit('testcollection', 'foo', {v: 0, create: {}}, {v: 1, data: {x: 7}}, null, function(err, succeeded) {
+        db.commit('testcollection', 'foo', {v: 0, create: {}}, {v: 1, data: {x: 7}}, null, function(err) {
           if (err) return done(err);
-          db.commit('testcollection', 'bar', {v: 0, create: {}}, {v: 1, data: {x: 7}}, null, function(err, succeeded) {
+          db.commit('testcollection', 'bar', {v: 0, create: {}}, {v: 1, data: {x: 7}}, null, function(err) {
             expect(err && err.code).equal(11000);
             done();
           });
@@ -70,9 +68,9 @@ describe('mongo db', function() {
     it('does not allow editing the system collection', function(done) {
       var db = this.db;
       db.commit('system', 'test', {v: 0, create: {}}, {}, null, function(err) {
-        expect(err).ok();
+        expect(err).ok;
         db.getSnapshot('system', 'test', null, null, function(err) {
-          expect(err).ok();
+          expect(err).ok;
           done();
         });
       });
@@ -80,26 +78,68 @@ describe('mongo db', function() {
   });
 
   describe('query', function() {
-    // Run query tests for the types of queries supported by ShareDBMingo
-    require('sharedb-mingo-memory/test/query')();
+    it('$count should count documents', function(done) {
+      var snapshots = [
+        {type: 'json0', id: 'test1', v: 1, data: {x: 1, y: 1}},
+        {type: 'json0', id: 'test2', v: 1, data: {x: 2, y: 2}},
+        {type: 'json0', id: 'test3', v: 1, data: {x: 3, y: 2}}
+      ];
+      var query = {$count: true, y: 2};
+
+      var db = this.db;
+      async.each(snapshots, function(snapshot, cb) {
+        db.commit('testcollection', snapshot.id, {v: 0, create: {}}, snapshot, null, cb);
+      }, function(err) {
+        if (err) return done(err);
+        db.query('testcollection', query, null, null, function(err, results, extra) {
+          if (err) return done(err);
+
+          expect(results).eql([]);
+          expect(extra).eql(2);
+          done();
+        });
+      });
+    });
+
+    it('$sort, $skip and $limit should order, skip and limit', function(done) {
+      var snapshots = [
+        {type: 'json0', v: 1, data: {x: 1}, id: 'test1', m: null},
+        {type: 'json0', v: 1, data: {x: 3}, id: 'test2', m: null}, // intentionally added out of sort order
+        {type: 'json0', v: 1, data: {x: 2}, id: 'test3', m: null}
+      ];
+      var query = {$sort: {x: 1}, $skip: 1, $limit: 1};
+
+      var db = this.db;
+      async.each(snapshots, function(snapshot, cb) {
+        db.commit('testcollection', snapshot.id, {v: 0, create: {}}, snapshot, null, cb);
+      }, function(err) {
+        if (err) return done(err);
+
+        db.query('testcollection', query, null, null, function(err, results) {
+          if (err) throw err;
+          expect(results).eql([snapshots[2]]);
+          done();
+        });
+      });
+    });
 
     it('does not allow $where queries', function(done) {
-      this.db.query('testcollection', {$where: 'true'}, null, null, function(err, results) {
-        expect(err).ok();
+      this.db.query('testcollection', {$where: 'true'}, null, null, function(err) {
+        expect(err).ok;
         done();
       });
     });
 
     it('queryPollDoc does not allow $where queries', function(done) {
       this.db.queryPollDoc('testcollection', 'somedoc', {$where: 'true'}, null, function(err) {
-        expect(err).ok();
+        expect(err).ok;
         done();
       });
     });
 
     it('$query is deprecated', function(done) {
       this.db.query('testcollection', {$query: {}}, null, null, function(err) {
-        expect(err).ok();
+        expect(err).ok;
         expect(err.code).eql(4106);
         done();
       });
@@ -107,7 +147,7 @@ describe('mongo db', function() {
 
     it('only one collection operation allowed', function(done) {
       this.db.query('testcollection', {$distinct: {y: 1}, $aggregate: {}}, null, null, function(err) {
-        expect(err).ok();
+        expect(err).ok;
         expect(err.code).eql(4108);
         done();
       });
@@ -115,7 +155,7 @@ describe('mongo db', function() {
 
     it('only one cursor operation allowed', function(done) {
       this.db.query('testcollection', {$count: true, $explain: true}, null, null, function(err) {
-        expect(err).ok();
+        expect(err).ok;
         expect(err.code).eql(4109);
         done();
       });
@@ -123,7 +163,7 @@ describe('mongo db', function() {
 
     it('cursor transform can\'t run after collection operation', function(done) {
       this.db.query('testcollection', {$distinct: {y: 1}, $sort: {y: 1}}, null, null, function(err) {
-        expect(err).ok();
+        expect(err).ok;
         expect(err.code).eql(4110);
         done();
       });
@@ -131,7 +171,7 @@ describe('mongo db', function() {
 
     it('cursor operation can\'t run after collection operation', function(done) {
       this.db.query('testcollection', {$distinct: {y: 1}, $count: true}, null, null, function(err) {
-        expect(err).ok();
+        expect(err).ok;
         expect(err.code).eql(4110);
         done();
       });
@@ -139,7 +179,7 @@ describe('mongo db', function() {
 
     it('non-object $readPref should return error', function(done) {
       this.db.query('testcollection', {$readPref: true}, null, null, function(err) {
-        expect(err).ok();
+        expect(err).ok;
         expect(err.code).eql(4107);
         done();
       });
@@ -148,14 +188,14 @@ describe('mongo db', function() {
     it('malformed $mapReduce should return error', function(done) {
       this.db.allowJSQueries = true; // required for $mapReduce
       this.db.query('testcollection', {$mapReduce: true}, null, null, function(err) {
-        expect(err).ok();
+        expect(err).ok;
         expect(err.code).eql(4107);
         done();
       });
     });
 
-    describe('queryPollDoc correctly filters on _id', function(done) {
-      var snapshot = {type: 'json0', v: 1, data: {}, id: "test"};
+    describe('queryPollDoc correctly filters on _id', function() {
+      var snapshot = {type: 'json0', v: 1, data: {}, id: 'test'};
 
       beforeEach(function(done) {
         this.db.commit('testcollection', snapshot.id, {v: 0, create: {}}, snapshot, null, done);
@@ -251,11 +291,11 @@ describe('mongo db', function() {
 
     it('does not let you run $aggregate queries without options.allowAggregateQueries', function(done) {
       var query = {$aggregate: [
-        {$group: {_id: '$y',count: {$sum: 1}}},
+        {$group: {_id: '$y', count: {$sum: 1}}},
         {$sort: {count: 1}}
       ]};
-      this.db.query('testcollection', query, null, null, function(err, results) {
-        expect(err).ok();
+      this.db.query('testcollection', query, null, null, function(err) {
+        expect(err).ok;
         done();
       });
     });
@@ -286,7 +326,7 @@ describe('mongo db', function() {
               }
             };
             db.query('testcollection', query, null, null, function(err) {
-              expect(err).ok();
+              expect(err).ok;
               done();
             });
           });
@@ -322,7 +362,7 @@ describe('mongo db', function() {
             };
             db.query('testcollection', query, null, null, function(err, results, extra) {
               if (err) return done(err);
-              expect(extra).eql([{_id: 'a', value: 12}, {_id: 'b', value: 15}]);
+              expect(extra).to.have.deep.members([{_id: 'a', value: 12}, {_id: 'b', value: 15}]);
               done();
             });
           });
@@ -335,11 +375,11 @@ describe('mongo db', function() {
 describe('mongo db connection', function() {
   describe('via url string', function() {
     beforeEach(function(done) {
-      this.db = ShareDbMongo({mongo: mongoUrl});
+      this.db = new ShareDbMongo({mongo: mongoUrl});
 
       // This will enqueue the callback, testing the 'pendingConnect'
       // logic.
-      this.db.getDbs(function(err, mongo, mongoPoll) {
+      this.db.getDbs(function(err, mongo) {
         if (err) return done(err);
         mongo.dropDatabase(function(err) {
           if (err) return done(err);
@@ -353,7 +393,7 @@ describe('mongo db connection', function() {
     });
 
     it('commit and query', function(done) {
-      var snapshot = {type: 'json0', v: 1, data: {}, id: "test", m: null};
+      var snapshot = {type: 'json0', v: 1, data: {}, id: 'test', m: null};
       var db = this.db;
 
       db.commit('testcollection', snapshot.id, {v: 0, create: {}}, snapshot, null, function(err) {
@@ -370,7 +410,7 @@ describe('mongo db connection', function() {
   describe('via url string with mongoPoll and pollDelay option', function() {
     beforeEach(function(done) {
       this.pollDelay = 1000;
-      this.db = ShareDbMongo({mongo: mongoUrl, mongoPoll: mongoUrl, pollDelay: this.pollDelay});
+      this.db = new ShareDbMongo({mongo: mongoUrl, mongoPoll: mongoUrl, pollDelay: this.pollDelay});
       done();
     });
 
@@ -382,7 +422,7 @@ describe('mongo db connection', function() {
       var db = this.db;
       var pollDelay = this.pollDelay;
 
-      var snapshot = {type: 'json0', v: 1, data: {}, id: "test"};
+      var snapshot = {type: 'json0', v: 1, data: {}, id: 'test'};
       var timeBeforeCommit = new Date;
       db.commit('testcollection', snapshot.id, {v: 0, create: {}}, snapshot, null, function(err) {
         if (err) return done(err);
@@ -482,20 +522,54 @@ describe('parse query', function() {
       doesNotModify({foo: {$in: [1, 2, 3]}});
       addsType({foo: {$in: [null, 2, 3]}});
       doesNotModify({foo: {$in: [null, 2, 3]}, bar: 1});
-    })
+    });
 
-    it('top-level $and', function() {
+    it('top-level $and alone', function() {
       doesNotModify({$and: [{foo: {$ne: null}}, {bar: {$ne: null}}]});
       doesNotModify({$and: [{foo: {$ne: 1}}, {bar: {$ne: null}}]});
       addsType({$and: [{foo: {$ne: 1}}, {bar: {$ne: 1}}]});
     });
 
-    it('top-level $or', function() {
+    describe('top-level $and with other conditions', function() {
+      // If the top-level $and could match a deleted doc, it should continue looking at the other
+      // top-level conditions.
+      it('does not add _type for "field: nonNullValue"', function() {
+        doesNotModify({$and: [{foo: {$ne: true}}], bar: 1});
+      });
+    });
+
+    it('top-level $or alone', function() {
       doesNotModify({$or: [{foo: {$ne: null}}, {bar: {$ne: null}}]});
       addsType({$or: [{foo: {$ne: 1}}, {bar: {$ne: null}}]});
       addsType({$or: [{foo: {$ne: 1}}, {bar: {$ne: 1}}]});
     });
 
+    describe('top-level $or with other conditions', function() {
+      // With conditions at top level that don't match deleted docs, the $or doesn't matter.
+      it('does not add _type for "field: nonNullValue"', function() {
+        doesNotModify({$or: [{foo: {$ne: true}}], bar: 1});
+      });
+      it('does not add _type for $in with nonNullValues', function() {
+        doesNotModify({$or: [{foo: {$ne: true}}], bar: {$in: ['a', 'b']}});
+      });
+      // If the other conditions could match deleted docs, then the $or _does_ matter.
+      it('adds _type for "field: null"', function() {
+        addsType({$or: [{foo: {$ne: true}}], bar: null});
+      });
+      it('adds _type for $in with a null value', function() {
+        addsType({$or: [{foo: {$ne: true}}], bar: {$in: ['a', 'b', null]}});
+      });
+      it('does not add _type when all $or branches do not match deleted docs', function() {
+        doesNotModify({
+          $or: [
+            {foo: {$ne: null}},
+            {bar: 1}
+          ],
+          baz: null
+        });
+      });
+    });
+
     it('malformed queries', function() {
       // if we don't understand the query, definitely don't mark it as
       // "safe as is"
@@ -505,6 +579,8 @@ describe('parse query', function() {
       addsType({foo: {$bad: 1}});
       addsType({$bad: [2, 3]});
       addsType({$and: [[{foo: 1}]]});
+      addsType({$and: 1});
+      addsType({$expr: {$gt: {$subtract: ['$endDate', '$startDate']}}});
     });
   });
 });