aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-04-23 04:59:42 +0800
committerDan Finlay <dan@danfinlay.com>2016-04-23 04:59:42 +0800
commitab9db44f4a62a6f7e9200fb5d8034cf967da5e34 (patch)
tree00c3cc88711dc5550630f93f04b2c8f1f651dc52
parent4a1dd26fc9b37f2d627b1b04bcd1fc8569378364 (diff)
downloadtangerine-wallet-browser-ab9db44f4a62a6f7e9200fb5d8034cf967da5e34.tar
tangerine-wallet-browser-ab9db44f4a62a6f7e9200fb5d8034cf967da5e34.tar.gz
tangerine-wallet-browser-ab9db44f4a62a6f7e9200fb5d8034cf967da5e34.tar.bz2
tangerine-wallet-browser-ab9db44f4a62a6f7e9200fb5d8034cf967da5e34.tar.lz
tangerine-wallet-browser-ab9db44f4a62a6f7e9200fb5d8034cf967da5e34.tar.xz
tangerine-wallet-browser-ab9db44f4a62a6f7e9200fb5d8034cf967da5e34.tar.zst
tangerine-wallet-browser-ab9db44f4a62a6f7e9200fb5d8034cf967da5e34.zip
Add migration to actual migration array, fix test
-rw-r--r--app/scripts/lib/migrations.js2
-rw-r--r--test/unit/migrations-test.js11
2 files changed, 10 insertions, 3 deletions
diff --git a/app/scripts/lib/migrations.js b/app/scripts/lib/migrations.js
index cab5bec66..0b8e6265c 100644
--- a/app/scripts/lib/migrations.js
+++ b/app/scripts/lib/migrations.js
@@ -2,7 +2,9 @@ var path = require('path')
var fs = require('fs')
var migration2 = require('../migrations/002')
+var migration3 = require('../migrations/003')
module.exports = [
migration2,
+ migration3,
]
diff --git a/test/unit/migrations-test.js b/test/unit/migrations-test.js
index 4170b8e62..3b347530a 100644
--- a/test/unit/migrations-test.js
+++ b/test/unit/migrations-test.js
@@ -2,21 +2,26 @@ var assert = require('assert')
var path = require('path')
var wallet1 = require(path.join('..', 'lib', 'migrations', '001.json'))
+
var migration2 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '002'))
var migration3 = require(path.join('..', '..', 'app', 'scripts', 'migrations', '003'))
describe('wallet1 is migrated successfully', function() {
- it('should convert etherscan provider', function(done) {
+ it('should convert providers', function(done) {
+
+ wallet1.data.config.provider = { type: 'etherscan', rpcTarget: null }
var firstResult = migration2.migrate(wallet1.data)
assert.equal(firstResult.config.provider.type, 'rpc', 'provider should be rpc')
- assert.equal(firstResult.config.provider.rpcTarget, 'https://rpc.metamask.io/', 'provider should be our rpc')
+ assert.equal(firstResult.config.provider.rpcTarget, 'https://rpc.metamask.io/', 'main provider should be our rpc')
var oldTestRpc = 'https://rawtestrpc.metamask.io/'
+ var newTestRpc = 'https://testrpc.metamask.io/'
firstResult.config.provider.rpcTarget = oldTestRpc
+
var secondResult = migration3.migrate(firstResult)
- assert.equal(firstResult.config.provider.rpcTarget, 'https://testrpc.metamask.io/', 'provider should be our rpc')
+ assert.equal(secondResult.config.provider.rpcTarget, newTestRpc)
done()
})