From 199663c0a46990ef08e3e1c0faf692f868f0bc6d Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Thu, 22 Jun 2017 12:51:53 -0700
Subject: Add test for infura controller.

---
 test/unit/infura-controller-test.js | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 test/unit/infura-controller-test.js

(limited to 'test')

diff --git a/test/unit/infura-controller-test.js b/test/unit/infura-controller-test.js
new file mode 100644
index 000000000..0665c498e
--- /dev/null
+++ b/test/unit/infura-controller-test.js
@@ -0,0 +1,34 @@
+// polyfill fetch
+global.fetch = global.fetch || require('isomorphic-fetch')
+
+const assert = require('assert')
+const nock = require('nock')
+const InfuraController = require('../../app/scripts/controllers/infura')
+
+describe('infura-controller', function () {
+  var infuraController
+
+  beforeEach(function () {
+    infuraController = new InfuraController()
+  })
+
+  describe('network status queries', function () {
+    describe('#checkInfuraNetworkStatus', function () {
+      it('should return an object reflecting the network statuses', function () {
+        this.timeout(15000)
+        nock('https://api.infura.io')
+          .get('/v1/status/metamask')
+          .reply(200, '{"mainnet": "ok", "ropsten": "degraded", "kovan": "down", "rinkeby": "ok"}')
+
+        infuraController.checkInfuraNetworkStatus()
+          .then(() => {
+            const networkStatus = infuraController.store.getState().infuraNetworkStatus
+            assert.equal(Object.keys(networkStatus).length, 4)
+            assert.equal(networkStatus.mainnet, 'ok')
+            assert.equal(networkStatus.ropsten, 'degraded')
+            assert.equal(networkStatus.kovan, 'down')
+          })
+      })
+    })
+  })
+})
-- 
cgit v1.2.3


From 1ddcbaad5bdd554d9711a9a7cdb29e71703325f3 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Thu, 22 Jun 2017 13:46:08 -0700
Subject: add `done` and stub fetch

---
 test/unit/infura-controller-test.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'test')

diff --git a/test/unit/infura-controller-test.js b/test/unit/infura-controller-test.js
index 0665c498e..75bd031ff 100644
--- a/test/unit/infura-controller-test.js
+++ b/test/unit/infura-controller-test.js
@@ -1,8 +1,9 @@
 // polyfill fetch
-global.fetch = global.fetch || require('isomorphic-fetch')
-
+global.fetch = global.fetch || function () {return Promise.resolve({
+    json: () => { return Promise.resolve({"mainnet": "ok", "ropsten": "degraded", "kovan": "down", "rinkeby": "ok"}) },
+  })
+}
 const assert = require('assert')
-const nock = require('nock')
 const InfuraController = require('../../app/scripts/controllers/infura')
 
 describe('infura-controller', function () {
@@ -14,20 +15,20 @@ describe('infura-controller', function () {
 
   describe('network status queries', function () {
     describe('#checkInfuraNetworkStatus', function () {
-      it('should return an object reflecting the network statuses', function () {
+      it('should return an object reflecting the network statuses', function (done) {
         this.timeout(15000)
-        nock('https://api.infura.io')
-          .get('/v1/status/metamask')
-          .reply(200, '{"mainnet": "ok", "ropsten": "degraded", "kovan": "down", "rinkeby": "ok"}')
-
         infuraController.checkInfuraNetworkStatus()
           .then(() => {
             const networkStatus = infuraController.store.getState().infuraNetworkStatus
+            const networkStatus2 = infuraController.store.getState()
             assert.equal(Object.keys(networkStatus).length, 4)
             assert.equal(networkStatus.mainnet, 'ok')
             assert.equal(networkStatus.ropsten, 'degraded')
             assert.equal(networkStatus.kovan, 'down')
           })
+          .then(() => done())
+          .catch(done)
+
       })
     })
   })
-- 
cgit v1.2.3


From 42a2bcb1325bd5763a6402d5c2d6634053da908b Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Thu, 22 Jun 2017 13:58:55 -0700
Subject: remove option fetch

---
 test/unit/infura-controller-test.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/unit/infura-controller-test.js b/test/unit/infura-controller-test.js
index 75bd031ff..7a2a114f9 100644
--- a/test/unit/infura-controller-test.js
+++ b/test/unit/infura-controller-test.js
@@ -1,5 +1,5 @@
 // polyfill fetch
-global.fetch = global.fetch || function () {return Promise.resolve({
+global.fetch = function () {return Promise.resolve({
     json: () => { return Promise.resolve({"mainnet": "ok", "ropsten": "degraded", "kovan": "down", "rinkeby": "ok"}) },
   })
 }
@@ -20,7 +20,6 @@ describe('infura-controller', function () {
         infuraController.checkInfuraNetworkStatus()
           .then(() => {
             const networkStatus = infuraController.store.getState().infuraNetworkStatus
-            const networkStatus2 = infuraController.store.getState()
             assert.equal(Object.keys(networkStatus).length, 4)
             assert.equal(networkStatus.mainnet, 'ok')
             assert.equal(networkStatus.ropsten, 'degraded')
-- 
cgit v1.2.3