nongo-driver 2.12.5 → 3.0.0

package/test/nongo.test.ts

@@ -1,7 +1,5 @@
 import clone from 'clone-deep';
-import fs from 'fs';
 import {ObjectId} from 'mongodb';
-import rimraf from 'rimraf';
 import Logger from 'wbb-logger';
 import {Nongo} from '../src';
 import DatabaseHelper from './database-helper';
@@ -21,7 +19,7 @@ process.on('unhandledRejection', (reason) => {
 
 async function find() {
   const client = await DatabaseHelper.getClient();
-  const db = client.db(await DatabaseHelper.getDbName());
+  const db = client.db(DatabaseHelper.getDbName());
   return await db.collection('DummyModel').find({}).toArray();
 }
 
@@ -368,7 +366,7 @@ describe('Testing DB operations...', () => {
     // Del obj 1 (using toHexString to keep test that prepareQuery works)
     const res = await nongo.col(DummyModel).remove({_id: model1.obj._id.toHexString()});
     // Check a model was deleted
-    expect(res).toEqual({n: 1, ok: 1});
+    expect(res).toEqual({acknowledged: true, deletedCount: 1});
 
     const docs = await nongo.col(DummyModel).find();
 
@@ -384,79 +382,71 @@ describe('Testing DB operations...', () => {
 
   it('Test indexes have been applied', async () => {
     const client = await DatabaseHelper.getClient();
-    const db = client.db(await DatabaseHelper.getDbName());
-    const {databaseName} = db;
-    const ns = `${databaseName}.DummyModel`;
+    const db = client.db(DatabaseHelper.getDbName());
 
     let expected: any = [
       {
-        v: 2,
-        key: {
-          _id: 1,
-        },
-        name: '_id_',
-        ns,
+         "v":2,
+         "key":{
+            "_id":1
+         },
+         "name":"_id_"
       },
       {
-        v: 2,
-        background: true,
-        key: {
-          'pets.likes.drink': 1,
-        },
-        name: 'pets.likes.drink_1',
-        ns,
+         "v":2,
+         "key":{
+            "name":1
+         },
+         "name":"name_1",
+         "background":true,
+         "unique":true
       },
       {
-        v: 2,
-        background: true,
-        key: {
-          'job.role': 1,
-        },
-        name: 'job.role_1',
-        ns,
+         "v":2,
+         "key":{
+            "pets.likes.drink":1
+         },
+         "name":"pets.likes.drink_1",
+         "background":true
       },
       {
-        background: true,
-        key: {
-          created: 1,
-          dontStripChildren: 1,
-        },
-        name: 'dontStripChildren_1_created_1',
-        ns,
-        v: 2,
+         "v":2,
+         "key":{
+            "job.role":1
+         },
+         "name":"job.role_1",
+         "background":true
       },
       {
-        background: true,
-        default_language: 'english',
-        key: {
-          _fts: 'text',
-          _ftsx: 1,
-        },
-        language_override: 'language',
-        name: 'age_text',
-        ns,
-        textIndexVersion: 3,
-        v: 2,
-        weights: {
-          age: 1,
-        },
+         "v":2,
+         "key":{
+            "dontStripChildren":1,
+            "created":1
+         },
+         "name":"dontStripChildren_1_created_1",
+         "background":true
       },
       {
-        v: 2,
-        background: true,
-        unique: true,
-        key: {
-          name: 1,
-        },
-        name: 'name_1',
-        ns,
-      },
-    ];
+         "v":2,
+         "key":{
+            "_fts":"text",
+            "_ftsx":1
+         },
+         "name":"age_text",
+         "background":true,
+         "weights":{
+            "age":1
+         },
+         "default_language":"english",
+         "language_override":"language",
+         "textIndexVersion":3
+      }
+   ]
 
     let nongo = await DatabaseHelper.getNongoInstance([DummyModel]);
     await nongo.ensureIndexes();
     let indexes = await db.collection('DummyModel').indexes();
-    expect(indexes).toEqual(expect.arrayContaining(expected));
+    expect(indexes).toEqual(expected);
     await nongo.mongoClient.close();
 
     expected = [
@@ -466,25 +456,22 @@ describe('Testing DB operations...', () => {
           _id: 1,
         },
         name: '_id_',
-        ns,
       },
       {
         v: 2,
         background: true,
         key: {
-          name: 1,
+          "pets.likes.drink": 1,
         },
-        name: 'name_1',
-        ns,
+        name: 'pets.likes.drink_1',
       },
       {
         v: 2,
         background: true,
         key: {
-          'pets.likes.drink': 1,
+          'name': 1,
         },
-        name: 'pets.likes.drink_1',
-        ns,
+        name: 'name_1',
       },
       {
         background: true,
@@ -495,7 +482,6 @@ describe('Testing DB operations...', () => {
         },
         language_override: 'language',
         name: 'name_text_age_text',
-        ns,
         textIndexVersion: 3,
         v: 2,
         weights: {
@@ -508,7 +494,7 @@ describe('Testing DB operations...', () => {
     nongo = await DatabaseHelper.getNongoInstance([DummyModelChanged]);
     await nongo.ensureIndexes();
     indexes = await db.collection('DummyModel').indexes();
-    expect(indexes).toEqual(expect.arrayContaining(expected));
+    expect(indexes).toEqual(expected);
     await nongo.mongoClient.close();
 
     await client.close();
@@ -517,54 +503,50 @@ describe('Testing DB operations...', () => {
   it(
     'Test old indexes were removed', async () => {
       const client = await DatabaseHelper.getClient();
-      const db = client.db(await DatabaseHelper.getDbName());
+      const db = client.db(DatabaseHelper.getDbName());
       const {databaseName} = db;
       const ns = `${databaseName}.DummyModel`;
       const expected: any = [
         {
-          key: {
-            _id: 1,
-          },
-          name: '_id_',
-          ns,
-          v: 2,
+           "key":{
+              "_id":1
+           },
+           "name":"_id_",
+           "v":2
         },
         {
-          background: true,
-          key: {
-            name: 1,
-          },
-          name: 'name_1',
-          ns,
-          v: 2,
+           "background":true,
+           "key":{
+              "pets.likes.drink":1
+           },
+           "name":"pets.likes.drink_1",
+           "v":2
         },
         {
-          background: true,
-          key: {
-            'pets.likes.drink': 1,
-          },
-          name: 'pets.likes.drink_1',
-          ns,
-          v: 2,
+           "background":true,
+           "key":{
+              "name":1
+           },
+           "name":"name_1",
+           "v":2
         },
         {
-          background: true,
-          default_language: 'english',
-          key: {
-            _fts: 'text',
-            _ftsx: 1,
-          },
-          language_override: 'language',
-          name: 'name_text_age_text',
-          ns,
-          textIndexVersion: 3,
-          v: 2,
-          weights: {
-            age: 1,
-            name: 1,
-          },
-        },
-      ];
+           "background":true,
+           "default_language":"english",
+           "key":{
+              "_fts":"text",
+              "_ftsx":1
+           },
+           "language_override":"language",
+           "name":"name_text_age_text",
+           "textIndexVersion":3,
+           "v":2,
+           "weights":{
+              "age":1,
+              "name":1
+           }
+        }
+     ]
 
       // create dummy model with maximum possible number of indexes
       let nongo = await DatabaseHelper.getNongoInstance([DummyModelWithMaxIndex]);
@@ -600,12 +582,11 @@ describe('Testing DB operations...', () => {
           count: {$sum: 1},
         },
       },
+      {
+        $sort: {_id: -1}
+      }
     ];
 
-    const options = {
-      sort: {name: -1},
-    };
-
     const expected = [
       {
         _id: 'obj2',
@@ -618,11 +599,11 @@ describe('Testing DB operations...', () => {
     ];
 
     // Aggreate and check result is correct
-    const results = await nongo.col(DummyModel).aggregate(pipeline, options);
+    const results = await nongo.col(DummyModel).aggregate(pipeline);
     expect(results).toHaveLength(2);
     expect(results).toEqual(expected);
 
-    for await (const doc of await nongo.col(DummyModel).aggregateIterator(pipeline, options)) {
+    for await (const doc of await nongo.col(DummyModel).aggregateIterator(pipeline)) {
       expect(expected.shift()).toEqual(doc);
     }
 
@@ -636,8 +617,14 @@ describe('Testing DB operations...', () => {
 
     const newAge = 999999999;
     const result = await nongo.col(DummyModel)
-      .update({}, {$set: {age: newAge}});
-    expect(result).toEqual({n: 2, nModified: 2, ok: 1});
+      .update({}, { $set: { age: newAge } });
+    expect(result).toEqual({
+      "acknowledged": true,
+      "matchedCount": 2,
+      "modifiedCount": 2,
+      "upsertedCount": 0,
+      "upsertedId": null,
+    });
 
     const doc = await nongo.col(DummyModel).findOne();
     expect(doc.obj.age).toBe(newAge);
@@ -727,35 +714,6 @@ describe('Testing DB operations...', () => {
     // Finish the test
     await nongo.mongoClient.close();
   });
-
-  it('Test creating collection dump', async () => {
-    // Insert and confirm it worked
-    const nongo: any = await DatabaseHelper.getNongoInstance(models);
-    await nongo.new(DummyModel, obj1).save();
-    expect(await nongo.col(DummyModel).findOne()).toBeDefined();
-
-    const dir = './testing/temp-dump';
-
-    // Make sure {@code dir} doesn't exist
-    expect(fs.existsSync(dir)).toBeFalsy();
-
-    await nongo.col(DummyModel).dumpCollection(dir, true);
-
-    // Check the dir has been populated by the dump
-    expect(fs.readdirSync(dir).length).toBeTruthy();
-
-    // Clean up {@code dir}
-    await new Promise(((resolve) => {
-      rimraf(dir, () => {
-        logger.info('Cleaned up ' + dir);
-        resolve();
-      });
-    }));
-
-    // Finish the test
-    await nongo.mongoClient.close();
-  });
-
 });
 
 it('test text index update', async () => {
@@ -769,41 +727,36 @@ it('test text index update', async () => {
   await nongo.ensureIndexes();
 
   const client = await DatabaseHelper.getClient();
-  const db = client.db(await DatabaseHelper.getDbName());
-  const {databaseName} = db;
-  const ns = `${databaseName}.TextIndexModel`;
+  const db = client.db(DatabaseHelper.getDbName());
   const indexes = await db.collection('TextIndexModel').indexes();
 
   expect(indexes).toEqual([{
     v: 2,
     key: {_id: 1},
     name: '_id_',
-    ns,
   },
+  {
+    v: 2,
+    unique: true,
+    key: {name: 1, module: 1},
+    name: 'name_1_module_1',
+    background: true,
+  },
+  {
+    v: 2,
+    key: {_fts: 'text', _ftsx: 1},
+    name: 'my_text_index',
+    background: true,
+    weights:
     {
-      v: 2,
-      unique: true,
-      key: {name: 1, module: 1},
-      name: 'name_1_module_1',
-      ns,
-      background: true,
+      'description.cy': 1,
+      'description.en': 1,
+      'description.es': 1,
+      'name': 1,
+      'summary': 1,
     },
-    {
-      v: 2,
-      key: {_fts: 'text', _ftsx: 1},
-      name: 'my_text_index',
-      ns,
-      background: true,
-      weights:
-        {
-          'description.cy': 1,
-          'description.en': 1,
-          'description.es': 1,
-          'name': 1,
-          'summary': 1,
-        },
-      default_language: 'english',
-      language_override: 'language',
-      textIndexVersion: 3,
-    }]);
+    default_language: 'english',
+    language_override: 'language',
+    textIndexVersion: 3,
+  }]);
 });