Merge pull request #3259 from MetaMask/controllerStubs

Offline testing

package.json

@@ -13,7 +13,7 @@
     "dist": "npm run dist:clear && npm install && gulp dist",
     "dist:clear": "rm -rf node_modules/eth-contract-metadata && rm -rf node_modules/eth-phishing-detect",
     "test": "npm run lint && npm run test:coverage && npm run test:integration",
-    "test:unit": "METAMASK_ENV=test mocha --exit --compilers js:babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"",
+    "test:unit": "METAMASK_ENV=test mocha --exit --require babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"",
     "test:single": "METAMASK_ENV=test mocha --require test/helper.js",
     "test:integration": "gulp build:scss && npm run test:flat && npm run test:mascara",
     "test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload",

test/unit/blacklist-controller-test.js

@@ -38,4 +38,4 @@ describe('blacklist controller', function () {
       assert.equal(result, false)
     })
   })
-})
+})

test/unit/metamask-controller-test.js

@@ -1,129 +1,103 @@
 const assert = require('assert')
 const sinon = require('sinon')
 const clone = require('clone')
+const nock = require('nock')
 const MetaMaskController = require('../../app/scripts/metamask-controller')
+const blacklistJSON = require('../stub/blacklist')
 const firstTimeState = require('../../app/scripts/first-time-state')
-const BN = require('ethereumjs-util').BN
-const GWEI_BN = new BN('1000000000')
 
 describe('MetaMaskController', function () {
-  const noop = () => {}
+  let metamaskController
-  const metamaskController = new MetaMaskController({
+  const sandbox = sinon.sandbox.create()
-    showUnconfirmedMessage: noop,
+  const noop = () => { }
-    unlockAccountMessage: noop,
-    showUnapprovedTx: noop,
-    platform: {},
-    encryptor: {
-      encrypt: function(password, object) {
-        this.object = object
-        return Promise.resolve()
-      },
-      decrypt: function () {
-        return Promise.resolve(this.object)
-      }
-    },
-    // initial state
-    initState: clone(firstTimeState),
-  })
 
   beforeEach(function () {
-    // sinon allows stubbing methods that are easily verified
+
-    this.sinon = sinon.sandbox.create()
+    nock('https://api.infura.io')
+      .persist()
+      .get('/v2/blacklist')
+      .reply(200, blacklistJSON)
+
+    nock('https://api.infura.io')
+      .persist()
+      .get(/.*/)
+      .reply(200)
+
+    metamaskController = new MetaMaskController({
+      showUnapprovedTx: noop,
+      encryptor: {
+        encrypt: function (password, object) {
+          this.object = object
+          return Promise.resolve()
+        },
+        decrypt: function () {
+          return Promise.resolve(this.object)
+        },
+      },
+      initState: clone(firstTimeState),
+    })
+    sandbox.spy(metamaskController.keyringController, 'createNewVaultAndKeychain')
+    sandbox.spy(metamaskController.keyringController, 'createNewVaultAndRestore')
   })
 
   afterEach(function () {
-    // sinon requires cleanup otherwise it will overwrite context
+    nock.cleanAll()
-    this.sinon.restore()
+    sandbox.restore()
   })
 
-  describe('Metamask Controller', function () {
+  describe('#getGasPrice', function () {
-    assert(metamaskController)
+    it('gives the 50th percentile lowest accepted gas price from recentBlocksController', async function () {
-
+      const realRecentBlocksController = metamaskController.recentBlocksController
-    beforeEach(function () {
+      metamaskController.recentBlocksController = {
-      sinon.spy(metamaskController.keyringController, 'createNewVaultAndKeychain')
+        store: {
-      sinon.spy(metamaskController.keyringController, 'createNewVaultAndRestore')
+          getState: () => {
-    })
+            return {
-
+              recentBlocks: [
-    afterEach(function () {
+                { gasPrices: [ '0x3b9aca00', '0x174876e800'] },
-      metamaskController.keyringController.createNewVaultAndKeychain.restore()
+                { gasPrices: [ '0x3b9aca00', '0x174876e800'] },
-      metamaskController.keyringController.createNewVaultAndRestore.restore()
+                { gasPrices: [ '0x174876e800', '0x174876e800' ]},
-    })
+                { gasPrices: [ '0x174876e800', '0x174876e800' ]},
-
+              ],
-    describe('#getGasPrice', function () {
-      it('gives the 50th percentile lowest accepted gas price from recentBlocksController', async function () {
-        const realRecentBlocksController = metamaskController.recentBlocksController
-        metamaskController.recentBlocksController = {
-          store: {
-            getState: () => {
-              return {
-                recentBlocks: [
-                  { gasPrices: [ '0x3b9aca00', '0x174876e800'] },
-                  { gasPrices: [ '0x3b9aca00', '0x174876e800'] },
-                  { gasPrices: [ '0x174876e800', '0x174876e800' ]},
-                  { gasPrices: [ '0x174876e800', '0x174876e800' ]},
-                ]
-              }
             }
-          }
+          },
-        }
+        },
+      }
 
-        const gasPrice = metamaskController.getGasPrice()
+      const gasPrice = metamaskController.getGasPrice()
-        assert.equal(gasPrice, '0x3b9aca00', 'accurately estimates 50th percentile accepted gas price')
+      assert.equal(gasPrice, '0x3b9aca00', 'accurately estimates 50th percentile accepted gas price')
-
-        metamaskController.recentBlocksController = realRecentBlocksController
-      })
-
-      it('gives the 1 gwei price if no blocks have been seen.', async function () {
-        const realRecentBlocksController = metamaskController.recentBlocksController
-        metamaskController.recentBlocksController = {
-          store: {
-            getState: () => {
-              return {
-                recentBlocks: []
-              }
-            }
-          }
-        }
-
-        const gasPrice = metamaskController.getGasPrice()
-        assert.equal(gasPrice, '0x' + GWEI_BN.toString(16), 'defaults to 1 gwei')
-
-        metamaskController.recentBlocksController = realRecentBlocksController
-      })
 
+      metamaskController.recentBlocksController = realRecentBlocksController
     })
+  })
 
-    describe('#createNewVaultAndKeychain', function () {
+  describe('#createNewVaultAndKeychain', function () {
-      it('can only create new vault on keyringController once', async function () {
+    it('can only create new vault on keyringController once', async function () {
-        const selectStub = sinon.stub(metamaskController, 'selectFirstIdentity')
+      const selectStub = sandbox.stub(metamaskController, 'selectFirstIdentity')
 
+      const password = 'a-fake-password'
 
-        const password = 'a-fake-password'
+      await metamaskController.createNewVaultAndKeychain(password)
+      await metamaskController.createNewVaultAndKeychain(password)
 
-        const first = await metamaskController.createNewVaultAndKeychain(password)
+      assert(metamaskController.keyringController.createNewVaultAndKeychain.calledOnce)
-        const second = await metamaskController.createNewVaultAndKeychain(password)
 
-        assert(metamaskController.keyringController.createNewVaultAndKeychain.calledOnce)
+      selectStub.reset()
-
-        selectStub.reset()
-      })
     })
+  })
 
-    describe('#createNewVaultAndRestore', function () {
+  describe('#createNewVaultAndRestore', function () {
-      it('should be able to call newVaultAndRestore despite a mistake.', async function () {
+    it('should be able to call newVaultAndRestore despite a mistake.', async function () {
-        // const selectStub = sinon.stub(metamaskController, 'selectFirstIdentity')
 
-        const password = 'what-what-what'
+      const password = 'what-what-what'
-        const wrongSeed = 'debris dizzy just program just float decrease vacant alarm reduce speak stadiu'
+      const wrongSeed = 'debris dizzy just program just float decrease vacant alarm reduce speak stadiu'
-        const rightSeed = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
+      const rightSeed = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
-          const first = await metamaskController.createNewVaultAndRestore(password, wrongSeed)
+      await metamaskController.createNewVaultAndRestore(password, wrongSeed)
-            .catch((e) => {
+        .catch((e) => {
-              return
+          return
-            })
+        })
-          const second = await metamaskController.createNewVaultAndRestore(password, rightSeed)
+      await metamaskController.createNewVaultAndRestore(password, rightSeed)
 
-        assert(metamaskController.keyringController.createNewVaultAndRestore.calledTwice)
+      assert(metamaskController.keyringController.createNewVaultAndRestore.calledTwice)
-      })
     })
   })
 })

test/unit/network-contoller-test.js

@@ -1,25 +1,38 @@
 const assert = require('assert')
+const nock = require('nock')
 const NetworkController = require('../../app/scripts/controllers/network')
 
+const { createTestProviderTools } = require('../stub/provider')
+const providerResultStub = {}
+const provider = createTestProviderTools({ scaffold: providerResultStub }).provider
+
 describe('# Network Controller', function () {
   let networkController
+  const noop = () => {}
   const networkControllerProviderInit = {
-    getAccounts: () => {},
+    getAccounts: noop,
   }
 
   beforeEach(function () {
+
+    nock('https://api.infura.io')
+      .get('/*/')
+      .reply(200)
+
+    nock('https://rinkeby.infura.io')
+      .post('/metamask')
+      .reply(200)
+
     networkController = new NetworkController({
-      provider: {
+      provider,
-        type: 'rinkeby',
-      },
     })
 
-    networkController.initializeProvider(networkControllerProviderInit, dummyProviderConstructor)
+    networkController.initializeProvider(networkControllerProviderInit, provider)
   })
   describe('network', function () {
     describe('#provider', function () {
       it('provider should be updatable without reassignment', function () {
-        networkController.initializeProvider(networkControllerProviderInit, dummyProviderConstructor)
+        networkController.initializeProvider(networkControllerProviderInit, provider)
         const proxy = networkController._proxy
         proxy.setTarget({ test: true, on: () => {} })
         assert.ok(proxy.test)
@@ -64,21 +77,4 @@ describe('# Network Controller', function () {
       })
     })
   })
-})
+})
-
-function dummyProviderConstructor() {
-  return {
-    // provider
-    sendAsync: noop,
-    // block tracker
-    _blockTracker: {},
-    start: noop,
-    stop: noop,
-    on: noop,
-    addListener: noop,
-    once: noop,
-    removeAllListeners: noop,
-  }
-}
-
-function noop() {}