diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/scripts/lib/config-manager.js | 4 | ||||
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | test/unit/config-manager-test.js | 13 |
4 files changed, 16 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 72dc2696d..20720e59d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Transaction history now has a hard limit. - Added info link on account screen that visits Etherscan. - Added shortcut to open MetaMask (Ctrl+Alt+M or Cmd+Opt/Alt+M) +- Prevent API calls in tests. - Fixed bug where sign message confirmation would sometimes render blank. ## 2.9.0 2016-08-22 diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js index 4d270bcdb..715efb42e 100644 --- a/app/scripts/lib/config-manager.js +++ b/app/scripts/lib/config-manager.js @@ -300,9 +300,10 @@ ConfigManager.prototype.updateConversionRate = function () { this.setConversionPrice(0) this.setConversionDate('N/A') }) + } -ConfigManager.prototype.setConversionPrice = function(price) { +ConfigManager.prototype.setConversionPrice = function (price) { var data = this.getData() data.conversionRate = Number(price) this.setData(data) @@ -372,4 +373,3 @@ ConfigManager.prototype.createShapeShiftTx = function (depositAddress, depositTy } this.setData(data) } - diff --git a/package.json b/package.json index 57d71e865..774af2b0c 100644 --- a/package.json +++ b/package.json @@ -108,6 +108,7 @@ "mocha-eslint": "^2.1.1", "mocha-jsdom": "^1.1.0", "mocha-sinon": "^1.1.5", + "nock": "^8.0.0", "qs": "^6.2.0", "qunit": "^0.9.1", "sinon": "^1.17.3", diff --git a/test/unit/config-manager-test.js b/test/unit/config-manager-test.js index eaa5376fd..6aa7146f0 100644 --- a/test/unit/config-manager-test.js +++ b/test/unit/config-manager-test.js @@ -1,9 +1,10 @@ -var assert = require('assert') +const assert = require('assert') const extend = require('xtend') const STORAGE_KEY = 'metamask-persistance-key' var configManagerGen = require('../lib/mock-config-manager') var configManager const rp = require('request-promise') +const nock = require('nock') describe('config-manager', function() { @@ -47,6 +48,10 @@ describe('config-manager', function() { describe('#updateConversionRate', function() { it('should retrieve an update for ETH to USD and set it in memory', function(done) { this.timeout(15000) + var usdMock = nock('https://www.cryptonator.com') + .get('/api/ticker/eth-USD') + .reply(200, '{"ticker":{"base":"ETH","target":"USD","price":"11.02456145","volume":"44948.91745289","change":"-0.01472534"},"timestamp":1472072136,"success":true,"error":""}') + assert.equal(configManager.getConversionRate(), false) var promise = new Promise( function (resolve, reject) { @@ -69,6 +74,12 @@ describe('config-manager', function() { it('should work for JPY as well.', function() { this.timeout(15000) assert.equal(configManager.getConversionRate(), false) + + var jpyMock = nock('https://www.cryptonator.com') + .get('/api/ticker/eth-JPY') + .reply(200, '{"ticker":{"base":"ETH","target":"JPY","price":"11.02456145","volume":"44948.91745289","change":"-0.01472534"},"timestamp":1472072136,"success":true,"error":""}') + + var promise = new Promise( function (resolve, reject) { configManager.setCurrentFiat('JPY') |