obs-store - use published module

4 files changed, 17 insertions, 26 deletions

diff --git a/test/integration/lib/idStore-migrator-test.js b/test/integration/lib/idStore-migrator-test.js
index d95cfb401..f2a437a7c 100644
--- a/test/integration/lib/idStore-migrator-test.js
+++ b/test/integration/lib/idStore-migrator-test.js
@@ -1,4 +1,4 @@
-const ObservableStore = require('../../../app/scripts/lib/observable/')
+const ObservableStore = require('obs-store')
 const ConfigManager = require('../../../app/scripts/lib/config-manager')
 const IdStoreMigrator = require('../../../app/scripts/lib/idStore-migrator')
 const SimpleKeyring = require('../../../app/scripts/keyrings/simple')
diff --git a/test/lib/mock-config-manager.js b/test/lib/mock-config-manager.js
index c62d91da9..72be86ed1 100644
--- a/test/lib/mock-config-manager.js
+++ b/test/lib/mock-config-manager.js
@@ -1,11 +1,10 @@
+const ObservableStore = require('obs-store')
+const clone = require('clone')
 const ConfigManager = require('../../app/scripts/lib/config-manager')
-const LocalStorageStore = require('../../app/scripts/lib/observable/local-storage')
 const firstTimeState = require('../../app/scripts/first-time-state')
 const STORAGE_KEY = 'metamask-config'
 
 module.exports = function() {
-  let dataStore = new LocalStorageStore({ storageKey: STORAGE_KEY })
-  // initial state for first time users
-  if (!dataStore.get()) dataStore.put(firstTimeState)
-  return new ConfigManager({ store: dataStore })
+  let store = new ObservableStore(clone(firstTimeState))
+  return new ConfigManager({ store })
 }
\ No newline at end of file
diff --git a/test/unit/config-manager-test.js b/test/unit/config-manager-test.js
index 83b242a8b..fa3929599 100644
--- a/test/unit/config-manager-test.js
+++ b/test/unit/config-manager-test.js
@@ -1,27 +1,23 @@
 // polyfill fetch
 global.fetch = global.fetch || require('isomorphic-fetch')
-// pollyfill localStorage support into JSDom
-global.localStorage = global.localStorage || polyfillLocalStorage()
 
 const assert = require('assert')
 const extend = require('xtend')
 const rp = require('request-promise')
 const nock = require('nock')
 const configManagerGen = require('../lib/mock-config-manager')
-const STORAGE_KEY = 'metamask-persistance-key'
 
 describe('config-manager', function() {
   var configManager
 
   beforeEach(function() {
-    global.localStorage.clear()
     configManager = configManagerGen()
   })
 
   describe('currency conversions', function() {
 
     describe('#getCurrentFiat', function() {
-      it('should return false if no previous key exists', function() {
+      it('should return undefined if no previous key exists', function() {
         var result = configManager.getCurrentFiat()
         assert.ok(!result)
       })
@@ -29,14 +25,14 @@ describe('config-manager', function() {
 
     describe('#setCurrentFiat', function() {
       it('should make getCurrentFiat return true once set', function() {
-        assert.equal(configManager.getCurrentFiat(), false)
+        assert.equal(configManager.getCurrentFiat(), undefined)
         configManager.setCurrentFiat('USD')
         var result = configManager.getCurrentFiat()
         assert.equal(result, 'USD')
       })
 
       it('should work with other currencies as well', function() {
-        assert.equal(configManager.getCurrentFiat(), false)
+        assert.equal(configManager.getCurrentFiat(), undefined)
         configManager.setCurrentFiat('JPY')
         var result = configManager.getCurrentFiat()
         assert.equal(result, 'JPY')
@@ -44,7 +40,7 @@ describe('config-manager', function() {
     })
 
     describe('#getConversionRate', function() {
-      it('should return false if non-existent', function() {
+      it('should return undefined if non-existent', function() {
         var result = configManager.getConversionRate()
         assert.ok(!result)
       })
@@ -57,7 +53,7 @@ describe('config-manager', function() {
           .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)
+        assert.equal(configManager.getConversionRate(), 0)
         var promise = new Promise(
           function (resolve, reject) {
             configManager.setCurrentFiat('USD')
@@ -78,7 +74,7 @@ describe('config-manager', function() {
 
       it('should work for JPY as well.', function() {
         this.timeout(15000)
-        assert.equal(configManager.getConversionRate(), false)
+        assert.equal(configManager.getConversionRate(), 0)
 
         var jpyMock = nock('https://www.cryptonator.com')
           .get('/api/ticker/eth-JPY')
@@ -106,7 +102,7 @@ describe('config-manager', function() {
   describe('confirmation', function() {
 
     describe('#getConfirmedDisclaimer', function() {
-      it('should return false if no previous key exists', function() {
+      it('should return undefined if no previous key exists', function() {
         var result = configManager.getConfirmedDisclaimer()
         assert.ok(!result)
       })
@@ -114,16 +110,16 @@ describe('config-manager', function() {
 
     describe('#setConfirmedDisclaimer', function() {
       it('should make getConfirmedDisclaimer return true once set', function() {
-        assert.equal(configManager.getConfirmedDisclaimer(), false)
+        assert.equal(configManager.getConfirmedDisclaimer(), undefined)
         configManager.setConfirmedDisclaimer(true)
         var result = configManager.getConfirmedDisclaimer()
         assert.equal(result, true)
       })
 
-      it('should be able to set false', function() {
-        configManager.setConfirmedDisclaimer(false)
+      it('should be able to set undefined', function() {
+        configManager.setConfirmedDisclaimer(undefined)
         var result = configManager.getConfirmedDisclaimer()
-        assert.equal(result, false)
+        assert.equal(result, undefined)
       })
 
       it('should persist to local storage', function() {
@@ -240,7 +236,3 @@ describe('config-manager', function() {
     })
   })
 })
-
-function polyfillLocalStorage(){
-  return Object.create({ clear: function(){ global.localStorage = polyfillLocalStorage() } })
-}
diff --git a/test/unit/idStore-migration-test.js b/test/unit/idStore-migration-test.js
index 4adbef740..38667fc3e 100644
--- a/test/unit/idStore-migration-test.js
+++ b/test/unit/idStore-migration-test.js
@@ -1,9 +1,9 @@
 const async = require('async')
 const assert = require('assert')
+const ObservableStore = require('obs-store')
 const ethUtil = require('ethereumjs-util')
 const BN = ethUtil.BN
 const ConfigManager = require('../../app/scripts/lib/config-manager')
-const ObservableStore = require('../../app/scripts/lib/observable/')
 const delegateCallCode = require('../lib/example-code.json').delegateCallCode
 
 // The old way: