2 files changed, 42 insertions, 6 deletions
diff --git a/test/integration/index.js b/test/integration/index.js
index f2d656b0b..85f91d92b 100644
--- a/test/integration/index.js
+++ b/test/integration/index.js
@@ -9,13 +9,15 @@ var b = browserify()
 // Remove old bundle
 try {
   fs.unlinkSync(bundlePath)
-} catch (e) {}
 
-var writeStream = fs.createWriteStream(bundlePath)
+  var writeStream = fs.createWriteStream(bundlePath)
 
-tests.forEach(function (fileName) {
-  b.add(path.join(__dirname, 'lib', fileName))
-})
+  tests.forEach(function (fileName) {
+    b.add(path.join(__dirname, 'lib', fileName))
+  })
 
-b.bundle().pipe(writeStream)
+  b.bundle().pipe(writeStream)
+} catch (e) {
+  console.error('Integration build failure', e)
+}
 
diff --git a/test/unit/infura-controller-test.js b/test/unit/infura-controller-test.js
new file mode 100644
index 000000000..7a2a114f9
--- /dev/null
+++ b/test/unit/infura-controller-test.js
@@ -0,0 +1,34 @@
+// 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 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 (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)
+
+      })
+    })
+  })
+})