refactor: use async/await, const and arrow function

Author: mariangz

tests/find/test-suite-1/test.set-operations.js

@@ -1,10 +1,10 @@
 'use strict';
 
-describe('test.set-operations.js', function () {
-  var sortById = testUtils.sortById;
+describe('test.set-operations.js', () => {
+  const sortById = testUtils.sortById;
 
-  beforeEach(function () {
-    return context.db.bulkDocs([
+  beforeEach(async () => {
+    await context.db.bulkDocs([
       { name: 'Mario', _id: 'mario', rank: 5, series: 'Mario', debut: 1981 },
       { name: 'Jigglypuff', _id: 'puff', rank: 8, series: 'Pokemon', debut: 1996 },
       { name: 'Link', rank: 10, _id: 'link', series: 'Zelda', debut: 1986 },
@@ -20,102 +20,92 @@ describe('test.set-operations.js', function () {
     ]);
   });
 
-  it('should work with $and 1', function () {
-    var db = context.db;
-    return db.createIndex({
+  it('should work with $and 1', async () => {
+    const db = context.db;
+    await db.createIndex({
       "index": {
         "fields": ["series"]
       }
-    }).then(function () {
-      return db.createIndex({
-        "index": {
-          "fields": ["debut"]
-        }
-      });
-    }).then(function () {
-      return db.find({
-        selector: {
-          $and: [
-            {series: 'Mario'},
-            {debut: {$gte: 1990}}
-          ]
-        },
-        fields: ['_id']
-      });
-    }).then(function (res) {
-      res.docs.sort(sortById);
-      res.docs.should.deep.equal([{_id: 'yoshi'}]);
     });
+    await db.createIndex({
+      "index": {
+        "fields": ["debut"]
+      }
+    });
+    const res = await db.find({
+      selector: {
+        $and: [
+          {series: 'Mario'},
+          {debut: {$gte: 1990}}
+        ]
+      },
+      fields: ['_id']
+    });
+    res.docs.sort(sortById);
+    res.docs.should.deep.equal([{_id: 'yoshi'}]);
   });
 
-  it('should work with $and 2, same index', function () {
-    var db = context.db;
-    return db.createIndex({
+  it('should work with $and 2, same index', async () => {
+    const db = context.db;
+    await db.createIndex({
       "index": {
         "fields": ["series", "debut"]
       }
-    }).then(function () {
-      return db.find({
-        selector: {
-          $and: [
-            {series: 'Mario'},
-            {debut: {$gte: 1990}}
-          ]
-        },
-        fields: ['_id']
-      });
-    }).then(function (res) {
-      res.docs.sort(sortById);
-      res.docs.should.deep.equal([{_id: 'yoshi'}]);
     });
+    const res = await db.find({
+      selector: {
+        $and: [
+          {series: 'Mario'},
+          {debut: {$gte: 1990}}
+        ]
+      },
+      fields: ['_id']
+    });
+    res.docs.sort(sortById);
+    res.docs.should.deep.equal([{_id: 'yoshi'}]);
   });
 
-  it('should work with $and 3, index/no-index', function () {
-    var db = context.db;
-    return db.createIndex({
+  it('should work with $and 3, index/no-index', async () => {
+    const db = context.db;
+    await db.createIndex({
       "index": {
         "fields": ["series"]
       }
-    }).then(function () {
-      return db.createIndex({
-        "index": {
-          "fields": ["rank"]
-        }
-      });
-    }).then(function () {
-      return db.find({
-        selector: {
-          $and: [
-            {series: 'Mario'},
-            {debut: {$gte: 1990}}
-          ]
-        },
-        fields: ['_id']
-      });
-    }).then(function (res) {
-      res.docs.sort(sortById);
-      res.docs.should.deep.equal([{_id: 'yoshi'}]);
     });
+    await db.createIndex({
+      "index": {
+        "fields": ["rank"]
+      }
+    });
+    const res = await db.find({
+      selector: {
+        $and: [
+          {series: 'Mario'},
+          {debut: {$gte: 1990}}
+        ]
+      },
+      fields: ['_id']
+    });
+    res.docs.sort(sortById);
+    res.docs.should.deep.equal([{_id: 'yoshi'}]);
   });
 
-  it('should work with $and 4, wrong index', function () {
-    var db = context.db;
-    return db.createIndex({
+  it('should work with $and 4, wrong index', async () => {
+    const db = context.db;
+    await db.createIndex({
       "index": {
         "fields": ["rank"]
       }
-    }).then(function () {
-      return db.find({
-        selector: {
-          $and: [
-            {series: 'Mario'},
-            {debut: {$gte: 1990}}
-          ]
-        },
-        fields: ['_id']
-      }).then(function (resp) {
-        resp.docs.should.deep.equal([{_id: 'yoshi'}]);
-      });
     });
+    const resp = await db.find({
+      selector: {
+        $and: [
+          {series: 'Mario'},
+          {debut: {$gte: 1990}}
+        ]
+      },
+      fields: ['_id']
+    });
+    resp.docs.should.deep.equal([{_id: 'yoshi'}]);
   });
 });