fix refactor

Author: mariangz

tests/integration/test.bulk_docs.js

@@ -334,54 +334,55 @@ adapters.forEach((adapter) => {
 
     it('#2935 new_edits=false with single unauthorized', async () => {
 
-      const isCouchDB = await testUtils.isCouchDB();
-      if (adapter !== 'http' || !isCouchDB) {
-        return;
-      }
+      testUtils.isCouchDB(async (isCouchDB) => {
+        if (adapter !== 'http' || !isCouchDB) {
+          return;
+        }
 
-      const ddoc = {
-        "_id": "_design/validate",
-        "validate_doc_update": function (newDoc) {
-          if (newDoc.foo === undefined) {
-            throw {unauthorized: 'Document must have a foo.'};
-          }
-        }.toString()
-      };
+        const ddoc = {
+          "_id": "_design/validate",
+          "validate_doc_update": function (newDoc) {
+            if (newDoc.foo === undefined) {
+              throw {unauthorized: 'Document must have a foo.'};
+            }
+          }.toString()
+        };
 
-      const db = new PouchDB(dbs.name);
+        const db = new PouchDB(dbs.name);
 
-      await db.put(ddoc);
-      const res = await db.bulkDocs({
-        docs: [
-          {
-            '_id': 'doc0',
-            '_rev': '1-x',
-            'foo': 'bar',
-            '_revisions': {
-              'start': 1,
-              'ids': ['x']
-            }
-          }, {
-            '_id': 'doc1',
-            '_rev': '1-x',
-            '_revisions': {
-              'start': 1,
-              'ids': ['x']
+        await db.put(ddoc);
+        const res = await db.bulkDocs({
+          docs: [
+            {
+              '_id': 'doc0',
+              '_rev': '1-x',
+              'foo': 'bar',
+              '_revisions': {
+                'start': 1,
+                'ids': ['x']
+              }
+            }, {
+              '_id': 'doc1',
+              '_rev': '1-x',
+              '_revisions': {
+                'start': 1,
+                'ids': ['x']
+              }
+            }, {
+              '_id': 'doc2',
+              '_rev': '1-x',
+              'foo': 'bar',
+              '_revisions': {
+                'start': 1,
+                'ids': ['x']
+              }
             }
-          }, {
-            '_id': 'doc2',
-            '_rev': '1-x',
-            'foo': 'bar',
-            '_revisions': {
-              'start': 1,
-              'ids': ['x']
-            }
-          }
-        ]
-      }, {new_edits: false});
-      res.should.have.length(1);
-      should.exist(res[0].error);
-      res[0].id.should.equal('doc1');
+          ]
+        }, {new_edits: false});
+        res.should.have.length(1);
+        should.exist(res[0].error);
+        res[0].id.should.equal('doc1');
+      });
     });
 
     it('Deleting _local docs with bulkDocs' , async () => {

tests/integration/utils.js

@@ -167,13 +167,11 @@ const parseHostWithCreds = (host) => {
 
 testUtils.isCouchDB = async (cb) => {
   const {url, options} = parseHostWithCreds(testUtils.couchHost());
-  const response = await PouchDB.fetch(url, options);
-  const res = await response.json();
-  const result = 'couchdb' in res || 'express-pouchdb' in res;
-  if (cb) {
-    cb(result);
-  }
-  return result;
+  PouchDB.fetch(url, options).then(function (response) {
+    return response.json();
+  }).then(function (res) {
+    cb('couchdb' in res || 'express-pouchdb' in res);
+  });
 };
 
 testUtils.getServerType = async () => {