Merge branch 'release/v0.17.1'

.travis.yml

@@ -7,4 +7,4 @@ branches:
     - develop
 before_script:
   - "#node app &"
-script: "#sudo npm test"
+script: "npm test"

HISTORY.md

@@ -1,4 +1,10 @@
+0.17.1
+------
+
+* Added tests for BSON conversion functions
+
 0.17.0
+------
 
 * Added support for all BSON data types except Binary
 * Fixed BSON converter so not only top-level values get converted

package.json

@@ -2,7 +2,7 @@
   "author": "Chun-hao Hu <hu.chunhao@gmail.com> (http://blog.huchunhao.com)",
   "name": "mongo-express",
   "description": "Web-based admin interface for MongoDB",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/andzdroid/mongo-express.git"

test/bson.js

@@ -0,0 +1,182 @@
+var bson = require('../bson');
+var expect = require('chai').expect;
+var mongodb = require('mongodb');
+
+describe('BSON', function() {
+  describe('toBSON', function() {
+    it('should convert documents with native JS types', function() {
+      var test = '{test: true, "s": "hello", i: -99.44}';
+      var result = bson.toBSON(test);
+
+      expect(result).to.eql({
+        test: true,
+        s: "hello",
+        i: -99.44
+      });
+    });
+
+    it('should convert ObjectID to BSON', function() {
+      var test = '{_id: ObjectID(), id2: ObjectId()}';
+      var result = bson.toBSON(test);
+
+      expect(result).to.have.property('_id').to.be.an.instanceof(mongodb.ObjectID);
+      expect(result).to.have.property('id2').to.be.an.instanceof(mongodb.ObjectID);
+    });
+
+    it('should convert ISODate to BSON', function() {
+      var test = '{date: ISODate(), date2: new Date()}';
+      var result = bson.toBSON(test);
+
+      expect(result).to.have.property('date').to.be.an.instanceof(Date);
+      expect(result).to.have.property('date2').to.be.an.instanceof(Date);
+    });
+
+    it('should convert Timestamp to BSON', function() {
+      var test = '{ts: Timestamp()}';
+      var result = bson.toBSON(test);
+
+      expect(result).to.have.property('ts').to.be.an.instanceof(mongodb.Timestamp);
+    });
+
+    it('should convert DBRef to BSON', function() {
+      var test = '{ref: DBRef("coll", "id"), ref2: DBRef("coll", "id", "db"), ref3: Dbref("coll", "id", "")}';
+      var result = bson.toBSON(test);
+
+      expect(result).to.have.property('ref').to.be.an.instanceof(mongodb.DBRef);
+      expect(result).to.have.property('ref').to.have.property('namespace', 'coll');
+      expect(result).to.have.property('ref').to.have.property('oid', 'id');
+      expect(result).to.have.property('ref').to.have.property('db', '');
+
+      expect(result).to.have.property('ref2').to.be.an.instanceof(mongodb.DBRef);
+      expect(result).to.have.property('ref2').to.have.property('db', 'db');
+
+      expect(result).to.have.property('ref3').to.be.an.instanceof(mongodb.DBRef);
+    });
+
+    it('should convert Symbol to BSON', function() {
+      var test = '{symbol: Symbol("test")}';
+      var result = bson.toBSON(test);
+
+      expect(result).to.have.property('symbol').to.be.an.instanceof(mongodb.Symbol);
+    });
+
+    it('should convert MinKey to BSON', function() {
+      var test = '{key: MinKey()}';
+      var result = bson.toBSON(test);
+
+      expect(result).to.have.property('key').to.be.an.instanceof(mongodb.MinKey);
+    });
+
+    it('should convert MaxKey to BSON', function() {
+      var test = '{key: MaxKey()}';
+      var result = bson.toBSON(test);
+
+      expect(result).to.have.property('key').to.be.an.instanceof(mongodb.MaxKey);
+    });
+
+    it('should convert Code to BSON', function() {
+      var test = '{code: Code(function() { x; }), code2: Code("function() { x; }")}';
+      var result = bson.toBSON(test);
+
+      expect(result).to.have.property('code').to.be.an.instanceof(mongodb.Code);
+      expect(result).to.have.property('code2').to.be.an.instanceof(mongodb.Code);
+    });
+  });
+
+
+  describe('toString', function() {
+    it('should convert simple documents', function() {
+      var test = {
+        bool: true,
+        str: "string",
+        number: -678.53,
+        list: [
+          1,
+          2,
+          3
+        ]
+      };
+      var result = bson.toString(test);
+      var test2 = bson.toBSON(result);
+
+      expect(test).to.eql(test2);
+    });
+
+    it('should convert ObjectID to string', function() {
+      var test = {
+        id: mongodb.ObjectID(),
+        id2: mongodb.ObjectID("4fb1299686a989240b000001")
+      };
+      var result = bson.toString(test);
+      var test2 = bson.toBSON(result);
+
+      expect(test).to.eql(test2);
+    });
+
+    it('should convert ISODate to string', function() {
+      var test = {
+        date: new Date()
+      };
+      var result = bson.toString(test);
+      var test2 = bson.toBSON(result);
+
+      expect(test).to.eql(test2);
+    });
+
+    it('should convert Timestamp to string', function() {
+      var test = {
+        ts: mongodb.Timestamp(),
+        ts2: mongodb.Timestamp(100, 100)
+      };
+      var result = bson.toString(test);
+      var test2 = bson.toBSON(result);
+
+      expect(test).to.eql(test2);
+    });
+
+    it('should convert DBRef to string', function() {
+      var test = {
+        ref: mongodb.DBRef("coll", "id", ""),
+        ref2: mongodb.DBRef("coll", "id", "db")
+      };
+      var result = bson.toString(test);
+      var test2 = bson.toBSON(result);
+
+      expect(test).to.eql(test2);
+    });
+
+    it('should convert Symbol to string', function() {
+      var test = { symbol: mongodb.Symbol("test") };
+      var result = bson.toString(test);
+      var test2 = bson.toBSON(result);
+
+      expect(test).to.eql(test2);
+    });
+
+    it('should convert MinKey to string', function() {
+      var test = { key: mongodb.MinKey() };
+      var result = bson.toString(test);
+      var test2 = bson.toBSON(result);
+
+      expect(test).to.eql(test2);
+    });
+
+    it('should convert MaxKey to string', function() {
+      var test = { key: mongodb.MaxKey() };
+      var result = bson.toString(test);
+      var test2 = bson.toBSON(result);
+
+      expect(test).to.eql(test2);
+    });
+
+    it('should convert Code to string', function() {
+      var test = {
+        code: mongodb.Code("function() { x; }")
+      };
+      var result = bson.toString(test);
+      var test2 = bson.toBSON(result);
+
+      expect(test).to.eql(test2);
+    });
+  });
+});