Merge branch 'master' into i#1203MainNetSwitch

4 files changed, 7 insertions, 99 deletions

diff --git a/test/integration/helpers.js b/test/integration/helpers.js
index eede103b4..10cd74e64 100644
--- a/test/integration/helpers.js
+++ b/test/integration/helpers.js
@@ -1,6 +1,6 @@
 function wait(time) {
-  return new Promise(function(resolve, reject) {
-    setTimeout(function() {
+  return new Promise(function (resolve, reject) {
+    setTimeout(function () {
       resolve()
     }, time * 3 || 1500)
   })
diff --git a/test/integration/index.js b/test/integration/index.js
index ff6d1baf8..f2d656b0b 100644
--- a/test/integration/index.js
+++ b/test/integration/index.js
@@ -1,10 +1,10 @@
 var fs = require('fs')
 var path = require('path')
-var browserify = require('browserify');
+var browserify = require('browserify')
 var tests = fs.readdirSync(path.join(__dirname, 'lib'))
 var bundlePath = path.join(__dirname, 'bundle.js')
 
-var b = browserify();
+var b = browserify()
 
 // Remove old bundle
 try {
@@ -13,9 +13,9 @@ try {
 
 var writeStream = fs.createWriteStream(bundlePath)
 
-tests.forEach(function(fileName) {
+tests.forEach(function (fileName) {
   b.add(path.join(__dirname, 'lib', fileName))
 })
 
-b.bundle().pipe(writeStream);
+b.bundle().pipe(writeStream)
 
diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js
index dbb88a3da..6c8cedbac 100644
--- a/test/integration/lib/first-time.js
+++ b/test/integration/lib/first-time.js
@@ -11,7 +11,7 @@ QUnit.test('render init screen', function (assert) {
 
     const recurseNotices = function () {
       let button = app.find('button')
-      if (button.html() === 'Continue') {
+      if (button.html() === 'Accept') {
         let termsPage = app.find('.markdown')[0]
         termsPage.scrollTop = termsPage.scrollHeight
         return wait().then(() => {
diff --git a/test/integration/lib/idStore-migrator-test.js b/test/integration/lib/idStore-migrator-test.js
deleted file mode 100644
index 290216ae8..000000000
--- a/test/integration/lib/idStore-migrator-test.js
+++ /dev/null
@@ -1,92 +0,0 @@
-const ObservableStore = require('obs-store')
-const ConfigManager = require('../../../app/scripts/lib/config-manager')
-const IdStoreMigrator = require('../../../app/scripts/lib/idStore-migrator')
-const SimpleKeyring = require('eth-simple-keyring')
-const normalize = require('eth-sig-util').normalize
-
-const oldStyleVault = require('../mocks/oldVault.json').data
-const badStyleVault = require('../mocks/badVault.json').data
-
-const PASSWORD = '12345678'
-const FIRST_ADDRESS = '0x4dd5d356c5A016A220bCD69e82e5AF680a430d00'.toLowerCase()
-const BAD_STYLE_FIRST_ADDRESS = '0xac39b311dceb2a4b2f5d8461c1cdaf756f4f7ae9'
-const SEED = 'fringe damage bounce extend tunnel afraid alert sound all soldier all dinner'
-
-QUnit.module('Old Style Vaults', {
-  beforeEach: function () {
-    let managers = managersFromInitState(oldStyleVault)
-
-    this.configManager = managers.configManager
-    this.migrator = managers.migrator
-  }
-})
-
-QUnit.test('migrator:isInitialized', function (assert) {
-  assert.ok(this.migrator)
-})
-
-QUnit.test('migrator:migratedVaultForPassword', function (assert) {
-  var done = assert.async()
-
-  this.migrator.migratedVaultForPassword(PASSWORD)
-  .then((result) => {
-    assert.ok(result, 'migratedVaultForPassword returned result')
-    const { serialized, lostAccounts } = result
-    assert.equal(serialized.data.mnemonic, SEED, 'seed phrase recovered')
-    assert.equal(lostAccounts.length, 0, 'no lost accounts')
-    done()
-  })
-})
-
-QUnit.module('Old Style Vaults with bad HD seed', {
-  beforeEach: function () {
-    let managers = managersFromInitState(badStyleVault)
-
-    this.configManager = managers.configManager
-    this.migrator = managers.migrator
-  }
-})
-
-QUnit.test('migrator:migratedVaultForPassword', function (assert) {
-  var done = assert.async()
-
-  this.migrator.migratedVaultForPassword(PASSWORD)
-  .then((result) => {
-    assert.ok(result, 'migratedVaultForPassword returned result')
-    const { serialized, lostAccounts } = result
-
-    assert.equal(lostAccounts.length, 1, 'one lost account')
-    assert.equal(lostAccounts[0].address, '0xe15D894BeCB0354c501AE69429B05143679F39e0'.toLowerCase())
-    assert.ok(lostAccounts[0].privateKey, 'private key exported')
-
-    var lostAccount = lostAccounts[0]
-    var privateKey = lostAccount.privateKey
-
-    var simple = new SimpleKeyring()
-    simple.deserialize([privateKey])
-    .then(() => {
-      return simple.getAccounts()
-    })
-    .then((accounts) => {
-      assert.equal(normalize(accounts[0]), lostAccount.address, 'recovered address.')
-      done()
-    })
-    .catch((reason) => {
-      assert.ifError(reason)
-      done(reason)
-    })
-  })
-})
-
-function managersFromInitState(initState){
-
-  let configManager = new ConfigManager({
-    store: new ObservableStore(initState),
-  })
-
-  let migrator = new IdStoreMigrator({
-    configManager: configManager,
-  })
-
-  return { configManager, migrator }
-}