viewdb 0.5.12 → 0.7.0

package/test/plugins/viewdb_timestamp_plugin.js

@@ -1,57 +1,55 @@
-var should = require('should');
 var ViewDb = require('../..');
 var ViewDbTimestampPlugin = require('../..').plugins.TimestampPlugin;
 var ViewDBVersioningPlugin = require('../..').plugins.VersioningPlugin;
 
-describe('Viewdb timestamp plugin', function () {
-  it('should add changeDateTime and createDateTime timestamp on insert', function (done) {
+describe('Viewdb timestamp plugin', () => {
+  it('should add changeDateTime and createDateTime timestamp on insert', (done) => {
     var viewDb = new ViewDb();
     new ViewDbTimestampPlugin(viewDb);
     new ViewDBVersioningPlugin(viewDb);
     var obj = { id: '123' };
     var collection = viewDb.collection('test');
-    var currentTime = (new Date().valueOf());
+    var currentTime = new Date().valueOf();
 
     // wait 1ms until update operation to check for lastModified updated
     setTimeout(function () {
       collection.insert(obj, function () {
         collection.find({ id: '123' }).toArray(function (err, objects) {
           var object = objects[0];
-          should.exists(object.createDateTime);
+          expect(object.createDateTime).exists;
           if (currentTime < object.createDateTime) {
             done();
           } else {
-            done(new Error('Timestamp was not renewed'))
+            done(new Error('Timestamp was not renewed'));
           }
         });
       });
     }, 5);
   });
-  it('should add changeDateTime and createDateTime timestamp on bulk insert', function (done) {
+  it('should add changeDateTime and createDateTime timestamp on bulk insert', (done) => {
     var viewDb = new ViewDb();
     new ViewDbTimestampPlugin(viewDb);
     new ViewDBVersioningPlugin(viewDb);
     var collection = viewDb.collection('test');
-    var currentTime = (new Date().valueOf());
+    var currentTime = new Date().valueOf();
 
     // wait 1ms until update operation to check for lastModified updated
     setTimeout(function () {
       collection.insert([{ _id: '123' }, { _id: '999' }], function () {
         collection.find({}).toArray(function (err, objects) {
-          var object = objects[0];
           var hasError = false;
           objects.forEach(function (object) {
-            should.exists(object.createDateTime);
+            expect(object.createDateTime).exists;
             if (currentTime >= object.createDateTime) {
               hasError = true;
             }
           });
-          hasError && done(new Error('Timestamp was not renewed')) || done();
+          (hasError && done(new Error('Timestamp was not renewed'))) || done();
         });
       });
     });
   });
-  it('should update changeDateTime on builk save', function (done) {
+  it('should update changeDateTime on builk save', (done) => {
     var viewDb = new ViewDb();
     new ViewDbTimestampPlugin(viewDb);
     new ViewDBVersioningPlugin(viewDb);
@@ -61,24 +59,30 @@ describe('Viewdb timestamp plugin', function () {
     collection.find({}).toArray(function (err, objects) {
       var insertTime = objects[0].createDateTime;
       var updateTime = objects[0].changeDateTime;
-      should.exist(insertTime);
-      insertTime.should.equal(updateTime);
+      expect(insertTime).toBeDefined();
+      expect(insertTime).toBe(updateTime);
       setTimeout(function () {
-        collection.save([{ _id: '123', name: 'Pelle', createDateTime: insertTime, changeDateTime: insertTime }, { _id: '999', name: 'Kalle', createDateTime: insertTime, changeDateTime: insertTime }], function () {
-          collection.find({}).toArray(function (err, objects) {
-            objects.forEach(function (object) {
-              object.createDateTime.should.equal(insertTime);
-              object.changeDateTime.should.greaterThan(insertTime);
+        collection.save(
+          [
+            { _id: '123', name: 'Pelle', createDateTime: insertTime, changeDateTime: insertTime },
+            { _id: '999', name: 'Kalle', createDateTime: insertTime, changeDateTime: insertTime }
+          ],
+          function () {
+            collection.find({}).toArray(function (err, objects) {
+              objects.forEach(function (object) {
+                expect(object.createDateTime).toBe(insertTime);
+                expect(object.changeDateTime).toBeGreaterThan(insertTime);
+              });
+              done();
             });
-            done();
-          });
-        })
+          }
+        );
       }, 100);
     });
 
     // wait 1ms until update operation to check for lastModified updated
   });
-  it('should update changeDateTime on save', function (done) {
+  it('should update changeDateTime on save', (done) => {
     var viewDb = new ViewDb();
     new ViewDbTimestampPlugin(viewDb);
     new ViewDBVersioningPlugin(viewDb);
@@ -98,14 +102,14 @@ describe('Viewdb timestamp plugin', function () {
       collection.save(obj);
       collection.find({ id: '123' }).toArray(function (err, objects) {
         var object = objects[0];
-        object.createDateTime.should.equal(insertTime);
-        object.changeDateTime.should.greaterThan(insertTime);
+        expect(object.createDateTime).toBe(insertTime);
+        expect(object.changeDateTime).toBeGreaterThan(insertTime);
         done();
       });
-    }, 1)
+    }, 1);
   });
 
-  it('should skip changing timestamp with skipTimestamp option on save', function (done) {
+  it('should skip changing timestamp with skipTimestamp option on save', (done) => {
     var viewDb = new ViewDb();
     new ViewDbTimestampPlugin(viewDb);
     new ViewDBVersioningPlugin(viewDb);
@@ -125,15 +129,15 @@ describe('Viewdb timestamp plugin', function () {
       collection.save(obj, { skipTimestamp: true }, function () {
         collection.find({ id: '123' }).toArray(function (err, objects) {
           var object = objects[0];
-          object.createDateTime.should.equal(insertTime);
-          object.changeDateTime.should.equal(insertTime);
+          expect(object.createDateTime).toBe(insertTime);
+          expect(object.changeDateTime).toBe(insertTime);
           done();
         });
       });
-    }, 1)
+    }, 1);
   });
 
-  it('should work together with version plugin', function (done) {
+  it('should work together with version plugin', (done) => {
     var viewDb = new ViewDb();
     new ViewDbTimestampPlugin(viewDb);
     new ViewDBVersioningPlugin(viewDb);
@@ -145,10 +149,10 @@ describe('Viewdb timestamp plugin', function () {
     collection.save(obj);
     collection.find({ id: '123' }).toArray(function (err, objects) {
       var object = objects[0];
-      object.version.should.equal(0);
-      object.name.should.equal('Pelle');
-      should.exists(object.createDateTime);
-      should.exists(object.changeDateTime);
+      expect(object.version).toBe(0);
+      expect(object.name).toBe('Pelle');
+      expect(object.createDateTime).exists;
+      expect(object.changeDateTime).exists;
       done();
     });
   });

package/test/plugins/viewdb_versioning_plugin.js

@@ -1,11 +1,10 @@
-var should = require('should');
 var _ = require('lodash');
 
 var ViewDb = require('../..');
 var ViewDbVersioningPlugin = require('../..').plugins.VersioningPlugin;
 
-describe('Viewdb versioning plugin', function () {
-  it('should add version on insert', function (done) {
+describe('Viewdb versioning plugin', () => {
+  it('should add version on insert', (done) => {
     var viewDb = new ViewDb();
     new ViewDbVersioningPlugin(viewDb);
     var obj = { id: '123' };
@@ -16,11 +15,11 @@ describe('Viewdb versioning plugin', function () {
     collection.find({ id: '123' }).toArray(function (err, objects) {
       var object = objects[0];
 
-      object.version.should.equal(0);
+      expect(object.version).toBe(0);
       done();
     });
   });
-  it('should add version on builk insert', function (done) {
+  it('should add version on builk insert', (done) => {
     var viewDb = new ViewDb();
     new ViewDbVersioningPlugin(viewDb);
 
@@ -28,12 +27,12 @@ describe('Viewdb versioning plugin', function () {
     collection.insert([{ id: '123' }, { id: '999' }]);
 
     collection.find({}).toArray(function (err, objects) {
-      objects[0].version.should.equal(0);
-      objects[1].version.should.equal(0);
+      expect(objects[0].version).toBe(0);
+      expect(objects[1].version).toBe(0);
       done();
     });
   });
-  it('should increase version on save', function (done) {
+  it('should increase version on save', (done) => {
     var viewDb = new ViewDb();
     new ViewDbVersioningPlugin(viewDb);
     var obj = { id: '123' };
@@ -45,34 +44,37 @@ describe('Viewdb versioning plugin', function () {
 
     collection.find({ id: '123' }).toArray(function (err, objects) {
       var object = objects[0];
-      object.version.should.equal(1);
-      object.name.should.equal('Pelle');
+      expect(object.version).toBe(1);
+      expect(object.name).toBe('Pelle');
       done();
     });
   });
 
-  it('should increase version on bulk save', function (done) {
+  it('should increase version on bulk save', (done) => {
     var viewDb = new ViewDb();
     new ViewDbVersioningPlugin(viewDb);
 
     var collection = viewDb.collection('test');
-    collection.insert([{ _id: '123', version: 10 }, { _id: '999', version: 101 }]);
+    collection.insert([
+      { _id: '123', version: 10 },
+      { _id: '999', version: 101 }
+    ]);
     collection.find({}).toArray(function (err, objects) {
       _.forEach(objects, function (o, i) {
         o.name = i === 0 ? 'Pelle' : 'Kalle';
-      })
+      });
       collection.save(objects, function () {
         collection.find({}).toArray(function (err, objects) {
-          objects[0].version.should.equal(12) // add 1 version for insert and one for save
-          objects[0].name.should.equal('Pelle');
-          objects[1].version.should.equal(103);
-          objects[1].name.should.equal('Kalle');
+          expect(objects[0].version).toBe(12); // add 1 version for insert and one for save
+          expect(objects[0].name).toBe('Pelle');
+          expect(objects[1].version).toBe(103);
+          expect(objects[1].name).toBe('Kalle');
           done();
         });
       });
     });
   });
-  it('should skip changing version with skipVersioning option on save', function (done) {
+  it('should skip changing version with skipVersioning option on save', (done) => {
     var viewDb = new ViewDb();
     new ViewDbVersioningPlugin(viewDb);
     var obj = { id: '123' };
@@ -80,16 +82,16 @@ describe('Viewdb versioning plugin', function () {
     var collection = viewDb.collection('test');
     collection.insert(obj);
     obj.name = 'Pelle';
-    collection.save(obj, {skipVersioning: true});
+    collection.save(obj, { skipVersioning: true });
 
     collection.find({ id: '123' }).toArray(function (err, objects) {
       var object = objects[0];
-      object.version.should.equal(0); // still version 0
-      object.name.should.equal('Pelle');
+      expect(object.version).toBe(0); // still version 0
+      expect(object.name).toBe('Pelle');
       done();
     });
-  });  
-  it('should add version on save', function (done) {
+  });
+  it('should add version on save', (done) => {
     var viewDb = new ViewDb();
     new ViewDbVersioningPlugin(viewDb);
     var obj = { id: '123' };
@@ -102,11 +104,9 @@ describe('Viewdb versioning plugin', function () {
 
     collection.find({ id: '123' }).toArray(function (err, objects) {
       var object = objects[0];
-      object.version.should.equal(0);
-      object.name.should.equal('Pelle');
+      expect(object.version).toBe(0);
+      expect(object.name).toBe('Pelle');
       done();
     });
   });
-
-
-})
+});

package/test/viewdb.js

@@ -1,199 +1,210 @@
-var should = require('should');
-
 var ViewDB = require('..');
 
-
-describe('ViewDB', function () {
-  describe('#count', function () {
-    it('should return 0 for empty collection', function (done) {
+describe('ViewDB', () => {
+  describe('#count', () => {
+    it('should return 0 for empty collection', (done) => {
       var db = new ViewDB();
       var collection = db.collection('documents');
       // Perform a total count command
       collection.count(function (err, count) {
-        count.should.equal(0);
+        expect(count).toBe(0);
         done();
       });
     });
   });
-  describe('#insert', function () {
-    it('should store a document and include it in count', function (done) {
+  describe('#insert', () => {
+    it('should store a document and include it in count', (done) => {
       var db = new ViewDB();
       var collection = db.collection('documents');
-      collection.insert({ a: 1 }, function (err, ids) {
-        should.not.exist(err);
+      collection.insert({ a: 1 }, function (err) {
+        expect(err).toBeFalsy();
         // Perform a total count command
         collection.count(function (err, count) {
-          count.should.equal(1);
+          expect(count).toBe(1);
           done();
           //assert.equal(null, err);
           //assert.equal(1, count);
         });
       });
     });
-    it('should add id on insert if missing', function (done) {
+    it('should add id on insert if missing', (done) => {
       var db = new ViewDB();
       var collection = db.collection('documents');
-      collection.insert({ a: 1 }, function (err, ids) {
+      collection.insert({ a: 1 }, function () {
         collection.find({ a: 1 }).toArray(function (err, res) {
-          should.exist(res[0]._id);
+          expect(res[0]._id).toBeDefined();
           done();
         });
       });
     });
-    it('should fail at storing a previously stored document', function (done) {
+    it('should fail at storing a previously stored document', (done) => {
       var db = new ViewDB();
       var collection = db.collection('documents');
-      collection.insert({ '_id': 1, a: 1 });
-      collection.insert({ '_id': 1, a: 2 }, function (err, ids) {
-        should.exist(err);
+      collection.insert({ _id: 1, a: 1 });
+      collection.insert({ _id: 1, a: 2 }, function (err) {
+        expect(err).toBeDefined();
         done();
       });
     });
 
-    it('should fail at storing an empty document', function (done) {
+    it('should fail at storing an empty document', (done) => {
       var db = new ViewDB();
       var collection = db.collection('documents');
-      collection.insert(1, function (err, ids) {
-        should.exist(err);
+      collection.insert(1, function (err) {
+        expect(err).toBeDefined();
         done();
       });
     });
-    it('#insert bulk should work', function (done) {
+    it('#insert bulk should work', (done) => {
       var db = new ViewDB();
       var collection = db.collection('documents');
-      collection.insert([{ a: 1 }, { b: 2 }], function (err, ids) {
+      collection.insert([{ a: 1 }, { b: 2 }], function () {
         collection.count(function (err, res) {
-          res.should.equal(2);
+          expect(res).toBe(2);
         });
         done();
       });
     });
   });
-  describe('#save', function () {
-    it('should save multiple', function (done) {
+  describe('#save', () => {
+    it('should save multiple', (done) => {
       var db = new ViewDB();
       var collection = db.collection('documents');
-      collection.insert([{ _id: 1, a: 1 }, { _id: 2, b: 2 }], function () {
-        collection.save([{ _id: 1, a: 10 }, { _id: 2, b: 20 }], function () {
-          collection.find({}).toArray(function (err, res) {
-            res.length.should.equal(2);
-            res[0].a.should.equal(10);
-            res[1].b.should.equal(20);
-            done();
-          });
-        });
-      });
+      collection.insert(
+        [
+          { _id: 1, a: 1 },
+          { _id: 2, b: 2 }
+        ],
+        function () {
+          collection.save(
+            [
+              { _id: 1, a: 10 },
+              { _id: 2, b: 20 }
+            ],
+            function () {
+              collection.find({}).toArray(function (err, res) {
+                expect(res.length).toBe(2);
+                expect(res[0].a).toBe(10);
+                expect(res[1].b).toBe(20);
+                done();
+              });
+            }
+          );
+        }
+      );
     });
-    it('should add id on insert if missing', function (done) {
+    it('should add id on insert if missing', (done) => {
       var db = new ViewDB();
       var collection = db.collection('documents');
       collection.save({ a: 1 });
       collection.save({ b: 1 });
       collection.count(function (err, result) {
-        result.should.equal(2);
+        expect(result).toBe(2);
         done();
-      })
+      });
     });
-    it('should add document on save', function (done) {
+    it('should add document on save', (done) => {
       var db = new ViewDB();
       var collection = db.collection('documents');
-      collection.save({ a: 1 }, function (err, ids) {
+      collection.save({ a: 1 }, function () {
         collection.count(function (err, count) {
-          count.should.equal(1);
+          expect(count).toBe(1);
           done();
         });
         //should.exist(ids._id);
         //done();
       });
     });
-    it('should merge if id exists', function (done) {
+    it('should merge if id exists', (done) => {
       var db = new ViewDB();
       var collection = db.collection('documents');
       collection.save({ a: 1 }, function (err, docs) {
         docs[0]['b'] = 2;
-        collection.save(docs, function (err, ids) {
+        collection.save(docs, function () {
           collection.count(function (err, count) {
-            count.should.equal(1);
+            expect(count).toBe(1);
             done();
           });
         });
-
       });
     });
   });
-  describe('#find', function () {
-    it('find all documents', function (done) {
+  describe('#find', () => {
+    it('find all documents', (done) => {
       var db = new ViewDB();
       var collection = db.collection('documents');
-      collection.insert({ a: 1 }, function (err, ids) {
+      collection.insert({ a: 1 }, function () {
         collection.find({}).toArray(function (err, docs) {
-          docs.length.should.equal(1);
-          docs[0].a.should.equal(1);
+          expect(docs.length).toBe(1);
+          expect(docs[0].a).toBe(1);
           done();
         });
       });
     });
-    it('find one document', function (done) {
+    it('find one document', (done) => {
       var db = new ViewDB();
       var collection = db.collection('documents');
       collection.insert({ a: 1 }, function (err, ids) {
         collection.find({ _id: ids[0]._id }).toArray(function (err, docs) {
-          docs.length.should.equal(1);
-          docs[0].a.should.equal(1);
+          expect(docs.length).toBe(1);
+          expect(docs[0].a).toBe(1);
           done();
         });
       });
     });
-    it('should return empty collection if query does not match', function (done) {
+    it('should return empty collection if query does not match', (done) => {
       var db = new ViewDB();
       var collection = db.collection('documents');
-      collection.insert({ a: 1 }, function (err, ids) {
+      collection.insert({ a: 1 }, function () {
         collection.find({ _id: 5 }).toArray(function (err, docs) {
-          docs.length.should.equal(0);
+          expect(docs.length).toBe(0);
           done();
         });
       });
     });
   });
-  describe('#remove', function () {
-    it('should remove one document matching a query', function (done) {
+  describe('#remove', () => {
+    it('should remove one document matching a query', (done) => {
       var db = new ViewDB();
       var collection = db.collection('documents');
-      collection.insert({ a: 1, name: 'hello' }, function (err, ids) {
-        collection.remove({ name: 'hello' }, null, function (err, docs) {
+      collection.insert({ a: 1, name: 'hello' }, function () {
+        collection.remove({ name: 'hello' }, null, function () {
           collection.find({}).toArray(function (err, res) {
-            res.length.should.equal(0);
+            expect(res.length).toBe(0);
             done();
           });
-        })
+        });
       });
-    })
+    });
 
-    it('shouldnt do anything when no documents are matched against the query', function (done) {
+    it('shouldnt do anything when no documents are matched against the query', (done) => {
       var db = new ViewDB();
       var collection = db.collection('documents');
-      collection.insert({ a: 1, name: 'hello' }, function (err, ids) {
-        collection.remove({ name: 'world' }, null, function (err, docs) {
+      collection.insert({ a: 1, name: 'hello' }, function () {
+        collection.remove({ name: 'world' }, null, function () {
           collection.find({}).toArray(function (err, res) {
-            res.length.should.equal(1);
+            expect(res.length).toBe(1);
             done();
           });
-        })
+        });
       });
     });
   });
-  describe('#drop', function () {
-    it('should remove all documents', function (done) {
+  describe('#drop', () => {
+    it('should remove all documents', (done) => {
       var store = new ViewDB();
       store.open().then(function () {
         store.collection('dollhouse').insert({ _id: 'echo' });
         store.collection('dollhouse').drop();
 
-        store.collection('dollhouse').find({}).toArray(function (err, results) {
-          results.length.should.equal(0);
-          done();
-        });
+        store
+          .collection('dollhouse')
+          .find({})
+          .toArray(function (err, results) {
+            expect(results.length).toBe(0);
+            done();
+          });
       });
     });
   });
-});
+});