(#157) - update and fix tests

Author: nolanlawson

.gitignore

@@ -10,3 +10,5 @@ _users
 _replicator
 config.json
 log.txt
+/pouchdb
+/tmp

.travis.yml

@@ -1,21 +1,28 @@
 language: node_js
 
 node_js:
-  - "stable"
+  - "6"
 
 sudo: false
 
 git:
   depth: 30
 
 addons:
-  firefox: "41.0.1"
+  firefox: "47.0.2"
 
 script: npm run $COMMAND
 
 before_script:
+  # Our test-browser.js script uses FIREFOX_BIN to find the Firefox binary
+  # See https://github.com/travis-ci/travis-ci/issues/4649
+  - echo "using firefox $(firefox --version)"
+  - export FIREFOX_BIN=$(which firefox)
+  # The next two lines are required for Firefox to run on Travis
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
+  # Fail early if there's a jshint problem
+  - npm run jshint
 
 env:
   global:
@@ -24,7 +31,6 @@ env:
   - secure: "MiufQQKR/EBoS7kcau/I7oYenVilysEqwx37zdgLEKlEUe3SxVOe31uLZv/bhfLNZiRuLAfmIOZmhLGnhMf0LaBzR2yC5qhBxrVHcAiTuS3q6zxpzEf02jnu+hACvj1kJJEPjpOLpEVx7ghWL4McEO0qLbdtSbQlm2IkOX1ONg0="
 
   matrix:
-  - COMMAND=jshint
   - CLIENT=node COMMAND=test-pouchdb
   - CLIENT=node SERVER_ARGS=--in-memory COMMAND=test-pouchdb
   - CLIENT=node SERVER_ARGS=--sqlite COMMAND=test-pouchdb

bin/test-pouchdb.sh

@@ -1,22 +1,15 @@
 #!/bin/bash
 
-# install pouchdb from git master rather than npm,
-# so we can run its own tests
-rm -fr node_modules/pouchdb
-git clone --depth 1 --single-branch --branch master \
-  https://github.com/pouchdb/pouchdb.git node_modules/pouchdb
+rm -fr tmp
+mkdir -p tmp
+cd tmp
 
-cd node_modules/pouchdb/
-npm install
-
-cd ../..
-
-./bin/pouchdb-server -n -p 6984 $SERVER_ARGS &
+../bin/pouchdb-server -n -p 6984 $SERVER_ARGS &
 POUCHDB_SERVER_PID=$!
 
-cd node_modules/pouchdb/
+cd ../pouchdb
 
-COUCH_HOST=http://localhost:6984 TIMEOUT=120000 npm run test-node
+COUCH_HOST=http://127.0.0.1:6984 TIMEOUT=120000 npm run test-node
 
 EXIT_STATUS=$?
 if [[ ! -z $POUCHDB_SERVER_PID ]]; then

bin/test-setup.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# install pouchdb from git rather than npm,
+# so we can run its own tests
+# also this branch may change as we update pouchdb
+# versions because we can't necessarily test against
+# the master tests since we use the version of pouchdb
+# from npm
+rm -rf pouchdb
+git clone --single-branch \
+  --branch master \
+  --depth 1 \
+  https://github.com/pouchdb/pouchdb.git pouchdb
+cd pouchdb
+npm install
+cd -

lib/logging.js

@@ -4,7 +4,7 @@ var Tail = require('tail').Tail;
 var LogParser = require('couchdb-log-parse');
 var colors = require('colors/safe');
 var fs = require('fs');
-var Promise = require('bluebird');
+var Promise = require('pouchdb-promise');
 
 var parser = new LogParser();
 parser.on('message', function (msg) {

package.json

@@ -16,28 +16,28 @@
   },
   "scripts": {
     "start": "node ./bin/pouchdb-server",
-    "test-pouchdb": "./bin/test-pouchdb.sh",
-    "test-couchdb": "./bin/test-couchdb.sh",
+    "test-pouchdb": "./bin/test-setup.sh && ./bin/test-pouchdb.sh",
+    "test-couchdb": "./bin/test-setup.sh && ./bin/test-couchdb.sh",
     "jshint": "./node_modules/.bin/jshint bin/pouchdb-server lib"
   },
   "engines": {
     "node": ">= 0.8.0"
   },
   "dependencies": {
-    "bluebird": "^2.4.2",
     "colors": "^1.0.3",
     "corser": "~2.0.0",
     "couchdb-harness": "*",
     "couchdb-log-parse": "^0.0.3",
     "express": "^4.10.4",
-    "express-pouchdb": "~1.0.4",
+    "express-pouchdb": "^2.1.3",
     "http-pouchdb": "^1.1.0",
     "killable": "^1.0.0",
     "memdown": "^1.0.0",
     "mkdirp": "^0.5.0",
     "nomnom": "^1.8.1",
     "pouchdb-adapter-node-websql": "^6.0.7",
     "pouchdb-node": "^6.0.7",
+    "pouchdb-promise": "6.1.0",
     "serve-favicon": "~2.0.1",
     "tail": "^0.4.0",
     "wordwrap": "0.0.2"