Merge pull request #221 from AmpersandJS/travis

update testing framework

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
 node_modules
-npm-
+*.log
 coverage
+.zuulrc

.travis.yml

@@ -1,17 +1,25 @@
 sudo: false
 language: node_js
-node_js:
-  - "4.1"
-  - "4.0"
-  - "0.12"
-  - "0.11"
-  - "0.10"
-  - "iojs"
-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 test
-  - npm run coverage
-after_script:
-  - npm run coveralls
+- npm run test-ci
+- npm run coverage
+after_script: npm run coveralls
+addons:
+  sauce_connect: true
+env:
+  global:
+  - secure: btzFDYkFe1soKzbALGL+lxG4E7j6iRj7iPsP/8SQd2m4o5afKmJB58RhSk/13slcaVWdytvI92iaFma+QVCnzYIEi+CYDKpaDXceKLYDcSVOXjIi1t9G368Mvz6Jh4ixdS9aRhKe9abLqbLXiBM/o3gv2V+jzmXxYAd3jS2im0g=
+  - secure: TDdIOcf3qGvXhQT4sTIKUEGJNqmPI/tMvmd1GlzuQDkblfgD5WuwKGZADu4RsdfFq2HzwrGDMqgDXOz7oqywo8ImpczWpWFx9wt4I/CtSAG2qNJ3tTAsdCRYvvPfw3aSrwW0ksyrIoIbdLPGWTwHJubKixpBM2ZpqaozfYk75g4=

.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

package.json

@@ -39,16 +39,13 @@
   "devDependencies": {
     "ampersand-collection": "^1.3.2",
     "ampersand-registry": "0.x.x",
-    "browserify": "^11.0.1",
     "coveralls": "^2.11.4",
     "istanbul": "^0.4.0",
     "jshint": "^2.5.3",
-    "phantomjs": "^1.9.7-15",
+    "phantomjs": "^1.9.19",
     "precommit-hook": "^3.0.0",
-    "run-browser": "^2.0.2",
-    "tap-spec": "^4.0.2",
     "tape": "^4.0.3",
-    "tape-run": "^1.1.0"
+    "zuul": "^3.9.0"
   },
   "homepage": "https://github.com/ampersandjs/ampersand-state",
   "keywords": [
@@ -63,10 +60,11 @@
     "url": "git://github.com/ampersandjs/ampersand-state"
   },
   "scripts": {
-    "test": "browserify test/index.js | tape-run | tap-spec",
+    "start": "zuul --local -- test/index.js",
+    "test": "zuul --phantom -- test/index.js",
+    "test-ci": "zuul -- test/index.js",
     "coverage": "rm -rf coverage && istanbul cover -- tape test/index.js --verbose",
     "validate": "npm ls",
-    "start": "run-browser test/index.js",
     "lint": "jshint ampersand-state.js ./test/*",
     "benchmark": "node --allow-natives-syntax benchmark/massCreate.js",
     "preversion": "git checkout master && git pull && npm ls",
@@ -75,22 +73,6 @@
     "publish-major": "npm run preversion && npm version major && git push origin master --tags && npm publish",
     "coveralls": "cat ./coverage/lcov.info | coveralls"
   },
-  "testling": {
-    "files": "test/*.js",
-    "browsers": [
-      "ie/9..latest",
-      "firefox/17..latest",
-      "firefox/nightly",
-      "chrome/22..latest",
-      "chrome/canary",
-      "opera/12..latest",
-      "opera/next",
-      "safari/5.1..latest",
-      "ipad/6.0..latest",
-      "iphone/6.0..latest",
-      "android-browser/4.2..latest"
-    ]
-  },
   "pre-commit": [
     "lint",
     "validate",