From a27677a87c783f8e4707343b4e900e2e44ceb42f Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 13 Apr 2016 15:46:39 -0700
Subject: Move UI deps into main plugin package.json

Also move UI test scripts into main plugin
Also move testing explanation to main plugin README.
---
 README.md | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 0d73de9ee..c98b87cfa 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ You now have the plugin, and can click 'inspect views: background plugin' to vie
 
 ### Developing the UI
 
-To enjoy the live-reloading that `gulp dev` offers while working on the `metamask-ui` or `web3-provider-engine` dependencies:
+To enjoy the live-reloading that `gulp dev` offers while working on the `web3-provider-engine` or other dependencies:
 
  1. Clone the dependency locally.
  2. `npm install` in its folder.
@@ -42,7 +42,22 @@ To enjoy the live-reloading that `gulp dev` offers while working on the `metamas
  4. Run `npm link $DEP_NAME` in this project folder.
  5. Next time you `gulp dev` it will watch the dependency for changes as well!
 
- ### Deploying the UI
+### Running Tests
+
+Currently the tests are split between two suites (we recently merged the UI into the main plugin repository).  There are two different test suites to be concerned with:
+
+Plugin tests, `npm test`.
+UI tests, `npm run testUi`.
+
+You can also run both of these with continuously watching processes, via `npm run watch` and `npm run watchUi`.
+
+#### UI Testing Particulars
+
+Requires `mocha` installed. Run `npm install -g mocha`.
+
+You can either run the test suite once with `npm testUi`, or you can reload on file changes, by running `mocha watch ui/test/**/**`.
+
+### Deploying the UI
 
  You must be authorized already on the Metamask plugin.
 
-- 
cgit v1.2.3


From b05e458ac2463c66751776466e05b8d0d7c21746 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 13 Apr 2016 16:13:45 -0700
Subject: Add waffle metrics to the README for fun

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'README.md')

diff --git a/README.md b/README.md
index c98b87cfa..b4ca19966 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Metamask Plugin
 
+[![Throughput Graph](https://graphs.waffle.io/MetaMask/metamask-plugin/throughput.svg)](https://waffle.io/MetaMask/metamask-plugin/metrics)
+
 ## Development
 
 ```bash
-- 
cgit v1.2.3