From 4445ba15694fc6ef7f9c4e3a2de5de5428e28b3a Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 25 Jul 2017 14:36:19 -0700
Subject: [PATCH] tx cont - add argument for provider constructor

---
 app/scripts/controllers/network.js  |  5 ++--
 test/unit/network-contoller-test.js | 36 +++++++++++++++++------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index c07f13b8d..0a3e5e26b 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -28,9 +28,9 @@ module.exports = class NetworkController extends EventEmitter {
     this._provider = provider
   }
 
-  initializeProvider (opts) {
+  initializeProvider (opts, providerContructor = MetaMaskProvider) {
     this.providerInit = opts
-    this._provider = MetaMaskProvider(opts)
+    this._provider = providerContructor(opts)
     this._proxy = new Proxy(this._provider, {
       get: (obj, name) => {
         if (name === 'on') return this._on.bind(this)
@@ -38,6 +38,7 @@ module.exports = class NetworkController extends EventEmitter {
       },
       set: (obj, name, value) => {
         this._provider[name] = value
+        return value
       },
     })
     this.provider.on('block', this._logBlock.bind(this))
diff --git a/test/unit/network-contoller-test.js b/test/unit/network-contoller-test.js
index 0c7ee9d70..87c2ee7a3 100644
--- a/test/unit/network-contoller-test.js
+++ b/test/unit/network-contoller-test.js
@@ -3,6 +3,9 @@ const NetworkController = require('../../app/scripts/controllers/network')
 
 describe('# Network Controller', function () {
   let networkController
+  const networkControllerProviderInit = {
+    getAccounts: () => {},
+  }
 
   beforeEach(function () {
     networkController = new NetworkController({
@@ -10,26 +13,13 @@ describe('# Network Controller', function () {
         type: 'rinkeby',
       },
     })
-    // stub out provider
-    networkController._provider = new Proxy({}, {
-      get: (obj, name) => {
-        return () => {}
-      },
-    })
-    networkController.providerInit = {
-      getAccounts: () => {},
-    }
 
-    networkController.ethQuery = new Proxy({}, {
-      get: (obj, name) => {
-        return () => {}
-      },
-    })
+    networkController.initializeProvider(networkControllerProviderInit, dummyProviderConstructor)
   })
   describe('network', function () {
     describe('#provider', function () {
       it('provider should be updatable without reassignment', function () {
-        networkController.initializeProvider(networkController.providerInit)
+        networkController.initializeProvider(networkControllerProviderInit, dummyProviderConstructor)
         const provider = networkController.provider
         networkController._provider = {test: true}
         assert.ok(provider.test)
@@ -75,3 +65,19 @@ describe('# Network Controller', function () {
     })
   })
 })
+
+function dummyProviderConstructor() {
+  return {
+    // provider
+    sendAsync: noop,
+    // block tracker
+    start: noop,
+    stop: noop,
+    on: noop,
+    addListener: noop,
+    once: noop,
+    removeAllListeners: noop,
+  }
+}
+
+function noop() {}
\ No newline at end of file