Merge pull request #1802 from MetaMask/RestructureNewUI

Restructure new ui branch folders

1 files changed, 49 insertions, 21 deletions

diff --git a/test/unit/infura-controller-test.js b/test/unit/infura-controller-test.js
index 7a2a114f9..605305efa 100644
--- a/test/unit/infura-controller-test.js
+++ b/test/unit/infura-controller-test.js
@@ -1,33 +1,61 @@
-// polyfill fetch
-global.fetch = function () {return Promise.resolve({
-    json: () => { return Promise.resolve({"mainnet": "ok", "ropsten": "degraded", "kovan": "down", "rinkeby": "ok"}) },
-  })
-}
 const assert = require('assert')
+const sinon = require('sinon')
 const InfuraController = require('../../app/scripts/controllers/infura')
 
 describe('infura-controller', function () {
-  var infuraController
+  let infuraController, sandbox, networkStatus
+  const response = {'mainnet': 'degraded', 'ropsten': 'ok', 'kovan': 'ok', 'rinkeby': 'down'}
 
-  beforeEach(function () {
+  before(async function () {
     infuraController = new InfuraController()
+    sandbox = sinon.sandbox.create()
+    sinon.stub(infuraController, 'checkInfuraNetworkStatus').resolves(response)
+    networkStatus = await infuraController.checkInfuraNetworkStatus()
+  })
+
+  after(function () {
+    sandbox.restore()
   })
 
-  describe('network status queries', function () {
-    describe('#checkInfuraNetworkStatus', function () {
-      it('should return an object reflecting the network statuses', function (done) {
-        this.timeout(15000)
-        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')
-          })
-          .then(() => done())
-          .catch(done)
+  describe('Network status queries', function () {
+
+    describe('Mainnet', function () {
+      it('should have Mainnet', function () {
+        assert.equal(Object.keys(networkStatus)[0], 'mainnet')
+      })
+
+      it('should have a value for Mainnet status', function () {
+        assert.equal(networkStatus.mainnet, 'degraded')
+      })
+    })
+
+    describe('Ropsten', function () {
+      it('should have Ropsten', function () {
+        assert.equal(Object.keys(networkStatus)[1], 'ropsten')
+      })
+
+      it('should have a value for Ropsten status', function () {
+        assert.equal(networkStatus.ropsten, 'ok')
+      })
+    })
+
+    describe('Kovan', function () {
+      it('should have Kovan', function () {
+        assert.equal(Object.keys(networkStatus)[2], 'kovan')
+      })
+
+      it('should have a value for Kovan status', function () {
+        assert.equal(networkStatus.kovan, 'ok')
+      })
+    })
+
+    describe('Rinkeby', function () {
+      it('should have Rinkeby', function () {
+        assert.equal(Object.keys(networkStatus)[3], 'rinkeby')
+      })
 
+      it('should have a value for Rinkeby status', function () {
+        assert.equal(networkStatus.rinkeby, 'down')
       })
     })
   })