Merge pull request #50 from fielded/feat/resolve-replication-conflicts

check for conflicting revision and resolve with the most recent version

Author: patriciagarcia

.babelrc

@@ -1,5 +1,8 @@
 {
   "presets": [
     ["es2015", { "modules": false }]
+  ],
+  "plugins": [
+    "external-helpers"
   ]
 }

.gitignore

@@ -1 +1,3 @@
 node_modules
+yarn.lock
+.idea

.travis.yml

@@ -1,9 +1,12 @@
 sudo: false
 language: node_js
 node_js:
-- '5.8'
+- 6
+services:
+- couchdb
 before_script:
 - npm install
+- ./node_modules/.bin/add-cors-to-couchdb
 script:
 - npm test
 cache:

README.md

@@ -52,6 +52,12 @@ The test suite is configured to run with PhantomJS and is powered by:
 npm test
 ```
 
+To run the integration tests:
+
+1. Enable CORS on your CouchDB
+2. If you have admin party enabled, run `npm t` (there is no step 3)
+3. Run `COUCHDB_URL=http://[user:pass@]example.com npm t`
+
 ## Release Process
 
 To make a release, you need to run `npm run build`, commit the `dist` folder and tag the commit with an appropiate version according to the [SemVer spec](http://semver.org/).