fix travis tests

Author: nolanlawson

.travis.yml

@@ -1,30 +1,24 @@
 language: node_js
 
+sudo: false
 services:
   - couchdb
 
 node_js:
-  - "0.10"
+  - "stable"
 script: npm run $COMMAND
 before_script:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
-  - "sleep 5"
-
-    # Workaround for Selenium #3280 issue
-  - "sudo sed -i 's/^127\\.0\\.0\\.1.*$/127.0.0.1 localhost/' /etc/hosts"
-
-    # Lets know what CouchDB we are playing with
-    # and make sure its logging debug
-  - "curl -X GET http://127.0.0.1:5984/"
-  - "curl -X PUT http://127.0.0.1:5984/_config/log/level -d '\"debug\"'"
-
-after_failure:
-  - "curl -X GET http://127.0.0.1:5984/_log?bytes=1000000"
+  - "npm install add-cors-to-couchdb"
+  - "./node_modules/.bin/add-cors-to-couchdb"
 
 env:
   matrix:
   - COMMAND=test
   - CLIENT=selenium:firefox COMMAND=test
   - CLIENT=selenium:phantomjs COMMAND=test
   - COMMAND=coverage
+branches:
+  only:
+  - master

package.json

@@ -54,8 +54,8 @@
     "phantomjs": "^1.9.7-5",
     "pouchdb": "5.2.1",
     "request": "^2.36.0",
-    "sauce-connect-launcher": "^0.4.2",
-    "selenium-standalone": "^3.0.2",
+    "sauce-connect-launcher": "^0.11.1",
+    "selenium-standalone": "^4.7.0",
     "uglify-js": "^2.4.13",
     "watchify": "~0.4.1",
     "wd": "^0.2.21"

test/test.js

@@ -49,15 +49,16 @@ function tests(dbName, dbType) {
 
   var db;
 
-  beforeEach(function () {
-    db = new Pouch(dbName);
-    return db;
-  });
-  afterEach(function () {
-    return db.destroy();
-  });
   describe(dbType + ': search test suite', function () {
     this.timeout(30000);
+
+    beforeEach(function () {
+      db = new Pouch(dbName);
+      return db;
+    });
+    afterEach(function () {
+      return db.destroy();
+    });
 
     it('basic search', function () {
       return db.bulkDocs({docs: docs}).then(function () {