electron-mocha does not work on travis - boo, hiss - roll back to jus…

…t mocha

.travis.yml

@@ -2,7 +2,7 @@ language: node_js
 node_js:
   - "4.2.2"
 after_script:
-  - npm run coverage-travis
+  - npm run coverage
   - cat ./coverage/lcov.info | ./node_modules/.bin/coveralls
 sudo: false
 env:

CONTRIBUTING.md

@@ -24,6 +24,21 @@ Inline Documentation
 Please make use of [JSDoc](http://usejsdoc.org/) style comments for modules.
 You can crack open any file in `app/lib` to see examples.
 
+Automated Testing
+-----------------
+
+
+
+Submitting Pull Requests
+------------------------
+
+If you are making non-trivial changes or have a long-running branch, be sure to
+go ahead and open a pull request and prefix the title with `[WIP]` to indicate
+that it is a work-in-progress. This will allow others to provide feedback while
+you are working and reduce the burden of reviewing large changes all at once.
+
+Be sure to include sufficient test coverage for your work.
+
 Project Structure & Patterns
 ----------------------------
 

README.md

@@ -2,8 +2,8 @@ DriveShare
 ==========
 
 [![Build Status](https://travis-ci.org/Storj/driveshare-gui.svg?branch=master)](https://travis-ci.org/Storj/driveshare-gui)
-
 [![Coverage Status](https://coveralls.io/repos/Storj/driveshare-gui/badge.svg?branch=master&service=github)](https://coveralls.io/github/Storj/driveshare-gui?branch=master)
+[![Stories in Ready](https://badge.waffle.io/Storj/driveshare-gui.svg?label=ready&title=Ready)](http://waffle.io/Storj/driveshare-gui)
 
 DriveShare is a cross-platform desktop application enabling users to earn money
 by sharing their extra hard drive space.

package.json

@@ -29,10 +29,8 @@
     "build": "./node_modules/.bin/gulp build",
     "release": "./node_modules/.bin/gulp release --env=production",
     "start": "node ./tasks/start",
-    "test": "npm run test-unit && npm run test-integration",
-    "test-unit": "./node_modules/.bin/electron-mocha ./app/test/unit/**",
-    "test-integration": "./node_modules/.bin/electron-mocha --renderer ./app/test/integration/**",
-    "coverage-travis": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha ./app/test/unit/** -- --recursive",
+    "test": "npm run test-unit",
+    "test-unit": "./node_modules/.bin/mocha ./app/test/unit/**",
     "coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha ./app/test/unit/** -- --recursive"
   },
   "dependencies": {