(#6859) - Remove isPouchDbServer from tests

tests/integration/test.all_docs.js

diff --git a/tests/integration/test.all_docs.js b/tests/integration/test.all_docs.js
index 28af28a..7466be3 100644
--- a/tests/integration/test.all_docs.js
+++ b/tests/integration/test.all_docs.js
@@ -767,44 +767,40 @@
     });
     
     
-    it('#6230 Test allDocs opts update_seq: true', function (done) {
+    it('#6230 Test allDocs opts update_seq: true', function () {
+
       var db = new PouchDB(dbs.name);
-      testUtils.isPouchDbServer(function (isPouchDbServer) {
-        if (isPouchDbServer) {
-          // pouchdb-server does not currently support opts.update_seq
-          return done();
-        }
-        return db.bulkDocs(origDocs).then(function () {
-          return db.allDocs({
-            update_seq: true
-          });
-        }).then(function (result) {
-          result.rows.should.have.length(4);
-          should.exist(result.update_seq);
-          result.update_seq.should.satisfy(function (update_seq) {
-            if (typeof update_seq === 'number' || typeof update_seq === 'string') {
-              return true;
-            } else {
-              return false;
-            }
-          });
-          var normSeq = normalizeSeq(result.update_seq);
-          normSeq.should.be.a('number');
-        }).then(done, done);
-        
-        function normalizeSeq(seq) {
-          try {
-            if (typeof seq === 'string' && seq.indexOf('-') > 0) {
-              return parseInt(seq.substring(0, seq.indexOf('-')));
-            }
-            return seq;
-          } catch (err) {
-            return seq;
+
+      return db.bulkDocs(origDocs).then(function () {
+        return db.allDocs({
+          update_seq: true
+        });
+      }).then(function (result) {
+        result.rows.should.have.length(4);
+        should.exist(result.update_seq);
+        result.update_seq.should.satisfy(function (update_seq) {
+          if (typeof update_seq === 'number' || typeof update_seq === 'string') {
+            return true;
+          } else {
+            return false;
           }
-        }
+        });
+        var normSeq = normalizeSeq(result.update_seq);
+        normSeq.should.be.a('number');
       });
+
+      function normalizeSeq(seq) {
+        try {
+          if (typeof seq === 'string' && seq.indexOf('-') > 0) {
+            return parseInt(seq.substring(0, seq.indexOf('-')));
+          }
+          return seq;
+        } catch (err) {
+          return seq;
+        }
+      }
     });
-    
+
     it('#6230 Test allDocs opts with update_seq missing', function () {
       var db = new PouchDB(dbs.name);
       return db.bulkDocs(origDocs).then(function () {

tests/integration/utils.js

diff --git a/tests/integration/utils.js b/tests/integration/utils.js
index 89a0fb9..830f67b 100644
--- a/tests/integration/utils.js
+++ b/tests/integration/utils.js
@@ -198,16 +198,6 @@
   });
 };
 
-testUtils.isPouchDbServer = function (cb) {
-  testUtils.ajax({ url: testUtils.couchHost() + '/' }, function (err, res) {
-    if (err || !res) {
-      return cb(false);
-    } else {
-      return cb('express-pouchdb' in res);
-    }
-  });
-};
-
 testUtils.writeDocs = function (db, docs, callback, res) {
   if (!res) {
     res = [];

tests/mapreduce/test.mapreduce.js

diff --git a/tests/mapreduce/test.mapreduce.js b/tests/mapreduce/test.mapreduce.js
index 9fa9a64..6180b00 100644
--- a/tests/mapreduce/test.mapreduce.js
+++ b/tests/mapreduce/test.mapreduce.js
@@ -3763,51 +3763,47 @@
     });
 
 
-    it('#6230 Test db.query() opts update_seq: true', function (done) {
+    it('#6230 Test db.query() opts update_seq: true', function () {
+
       var db = new PouchDB(dbName);
-      testUtils.isPouchDbServer(function (isPouchDbServer) {
-        if (isPouchDbServer) {
-          // pouchdb-server does not currently support opts.update_seq
-          return done();
-        }
-        var docs = [];
-        for (var i = 0; i < 4; i++) {
-          docs.push({
-            _id: i.toString(),
-            name: 'foo',
-          });
-        }
-        return db.bulkDocs({ docs: docs }).then(function () {
-          return createView(db, {
-            map: "function(doc){emit(doc.name);};\n"
-          });
-        }).then(function (queryFun) {
-          return db.query(queryFun, { update_seq: true });
-        }).then(function (result) {
-          result.rows.should.have.length(4);
-          should.exist(result.update_seq);
-          result.update_seq.should.satisfy(function (update_seq) {
-            if (typeof update_seq === 'number' || typeof update_seq === 'string') {
-              return true;
-            } else {
-              return false;
-            }
-          });
-          var normSeq = normalizeSeq(result.update_seq);
-          normSeq.should.be.a('number');
-        }).then(done, done);
-        
-        function normalizeSeq(seq) {
-          try {
-            if (typeof seq === 'string' && seq.indexOf('-') > 0) {
-              return parseInt(seq.substring(0, seq.indexOf('-')));
-            }
-            return seq;
-          } catch (err) {
-            return seq;
+      var docs = [];
+      for (var i = 0; i < 4; i++) {
+        docs.push({
+          _id: i.toString(),
+          name: 'foo',
+        });
+      }
+
+      return db.bulkDocs({ docs: docs }).then(function () {
+        return createView(db, {
+          map: "function(doc){emit(doc.name);};\n"
+        });
+      }).then(function (queryFun) {
+        return db.query(queryFun, { update_seq: true });
+      }).then(function (result) {
+        result.rows.should.have.length(4);
+        should.exist(result.update_seq);
+        result.update_seq.should.satisfy(function (update_seq) {
+          if (typeof update_seq === 'number' || typeof update_seq === 'string') {
+            return true;
+          } else {
+            return false;
           }
+        });
+        var normSeq = normalizeSeq(result.update_seq);
+        normSeq.should.be.a('number');
+      });
+
+      function normalizeSeq(seq) {
+        try {
+          if (typeof seq === 'string' && seq.indexOf('-') > 0) {
+            return parseInt(seq.substring(0, seq.indexOf('-')));
+          }
+          return seq;
+        } catch (err) {
+          return seq;
         }
-      });  
+      }
     });
 
     it('#6230 Test db.query() opts with update_seq missing', function () {