Merge branch 'master' into transactionControllerRefractor

2 files changed, 29 insertions, 3 deletions

diff --git a/test/unit/blacklister-test.js b/test/unit/blacklister-test.js
new file mode 100644
index 000000000..1badc2c8f
--- /dev/null
+++ b/test/unit/blacklister-test.js
@@ -0,0 +1,24 @@
+const assert = require('assert')
+const isPhish = require('../../app/scripts/lib/is-phish')
+
+describe('blacklister', function () {
+  describe('#isPhish', function () {
+    it('should not flag whitelisted values', function () {
+      var result = isPhish({ hostname: 'www.metamask.io' })
+      assert(!result)
+    })
+    it('should flag explicit values', function () {
+      var result = isPhish({ hostname: 'metamask.com' })
+      assert(result)
+    })
+    it('should flag levenshtein values', function () {
+      var result = isPhish({ hostname: 'metmask.com' })
+      assert(result)
+    })
+    it('should not flag not-even-close values', function () {
+      var result = isPhish({ hostname: 'example.com' })
+      assert(!result)
+    })
+  })
+})
+
diff --git a/test/unit/nonce-tracker-test.js b/test/unit/nonce-tracker-test.js
index 16cd6d008..b0283e159 100644
--- a/test/unit/nonce-tracker-test.js
+++ b/test/unit/nonce-tracker-test.js
@@ -18,11 +18,13 @@ describe('Nonce Tracker', function () {
 
 
     getPendingTransactions = () => pendingTxs
-    provider = { sendAsync: (_, cb) => { cb(undefined, {result: '0x0'}) } }
-    nonceTracker = new NonceTracker({
-      blockTracker: {
+    provider = {
+      sendAsync: (_, cb) => { cb(undefined, {result: '0x0'}) },
+      _blockTracker: {
         getCurrentBlock: () => '0x11b568',
       },
+    }
+    nonceTracker = new NonceTracker({
       provider,
       getPendingTransactions,
     })