Merge pull request #40 from AmpersandJS/travis

update testing framework

.gitignore

@@ -1,2 +1,4 @@
 .DS_Store
 node_modules
+*.log
+.zuulrc

.travis.yml

@@ -1,4 +1,22 @@
+sudo: false
 language: node_js
-before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+node_js: '4'
+cache:
+  directories: node_modules
+before_script: npm prune
+branches:
+  except: /^v\d+\.\d+\.\d+$/
+notifications:
+  webhooks:
+    urls: https://webhooks.gitter.im/e/df4440290bd89d941fb4
+    on_success: change
+    on_failure: always
+    on_start: false
+  email: false
+script: npm run test-ci
+addons:
+  sauce_connect: true
+env:
+  global:
+  - secure: D22uC702yruse/ZH6G8tZsrFDlFTJyjKweifsld1ErGED440jNhjDhgBwW8/WHRXb0xf4rhkKZ/IQXs22JsNcJ+T5jQc/UiB7sYZWF4rpiZzvUtYpxm89QV20Vk0jKEuz50G+6jK+4KUXurnAEpajS7pQcd6/2BBw3iinX5Jwt8=
+  - secure: gGBORVkrVXwN3IuhAmzSsY89YFgpu292gXqb8nkH87k4m71CVqKu6gdItX5S0kTro9fKnNPg9dYfU3IDq/i3y5JFKy3vVUGYQTFJgxTH8Qezqee+sIyxeOaFFBFIyyX8Ctp+YJNDpyGoFIKz9z5dJZWn/X6pC02Yqz7qAYkCof8=

.zuul.yml

@@ -0,0 +1,14 @@
+ui: tape
+browsers:
+  - name: chrome
+    version: latest
+  - name: firefox
+    version: latest
+  - name: safari
+    version: latest
+  - name: ie
+    version: 9..latest
+  - name: iphone
+    version: latest
+  - name: android
+    version: latest

README.md

@@ -76,4 +76,3 @@ All credit for this approach in backbone goes to Jeremy Ashkenas and the rest of
 ## license
 
 MIT
-

package.json

@@ -23,13 +23,12 @@
     "ampersand-collection": "^1.3.15",
     "ampersand-model": "^6.0.2",
     "bluebird": "^3.1.1",
-    "browserify": "^12.0.1",
+    "function-bind": "^1.0.2",
     "jshint": "^2.5.1",
+    "phantomjs": "^1.9.19",
     "precommit-hook": "^3.0.0",
-    "run-browser": "^2.0.2",
-    "tap-spec": "^4.1.0",
     "tape": "^4.2.0",
-    "tape-run": "^2.1.0"
+    "zuul": "^3.9.0"
   },
   "homepage": "https://github.com/ampersandjs/ampersand-collection-rest-mixin",
   "keywords": [
@@ -44,8 +43,9 @@
     "url": "git://github.com/ampersandjs/ampersand-collection-rest-mixin"
   },
   "scripts": {
-    "start": "run-browser test/main.js",
-    "test": "browserify test/main.js | tape-run | tap-spec",
+    "start": "zuul --local -- test/main.js",
+    "test": "zuul --phantom -- test/main.js",
+    "test-ci": "zuul -- test/main.js",
     "lint": "jshint .",
     "validate": "npm ls"
   },

test/main.js

@@ -4,6 +4,9 @@ var AmpersandCollection = require('ampersand-collection');
 var AmpersandModel = require('ampersand-model');
 var Sync = require('ampersand-sync');
 
+// Patch PhantomJS.
+if (!Function.prototype.bind) Function.prototype.bind = require('function-bind');
+
 /* global -Promise */
 var Promise = require('bluebird');