fix conflicts

4 files changed, 43 insertions, 30 deletions

diff --git a/test/lib/mock-config-manager.js b/test/lib/mock-config-manager.js
deleted file mode 100644
index 0cc6953bb..000000000
--- a/test/lib/mock-config-manager.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const ObservableStore = require('obs-store')
-const clone = require('clone')
-const ConfigManager = require('../../app/scripts/lib/config-manager')
-const firstTimeState = require('../../app/scripts/first-time-state')
-
-module.exports = function () {
-  const store = new ObservableStore(clone(firstTimeState))
-  return new ConfigManager({ store })
-}
diff --git a/test/lib/mock-encryptor.js b/test/lib/mock-encryptor.js
index 48aa9e52c..852c536c2 100644
--- a/test/lib/mock-encryptor.js
+++ b/test/lib/mock-encryptor.js
@@ -1,5 +1,5 @@
 var mockHex = '0xabcdef0123456789'
-var mockKey = new Buffer(32)
+var mockKey = Buffer.alloc(32)
 let cacheVal
 
 module.exports = {
diff --git a/test/lib/render-helpers.js b/test/lib/render-helpers.js
new file mode 100644
index 000000000..81f0e27aa
--- /dev/null
+++ b/test/lib/render-helpers.js
@@ -0,0 +1,42 @@
+const { shallow, mount } = require('enzyme')
+import { BrowserRouter } from 'react-router-dom'
+import { shape } from 'prop-types'
+
+module.exports = {
+  shallowWithStore,
+  mountWithStore,
+  mountWithRouter,
+}
+
+function shallowWithStore (component, store) {
+  const context = {
+    store,
+  }
+  return shallow(component, {context})
+}
+
+function mountWithStore (component, store) {
+  const context = {
+    store,
+  }
+  return mount(component, {context})
+}
+
+function mountWithRouter (node) {
+
+  // Instantiate router context
+  const router = {
+    history: new BrowserRouter().history,
+    route: {
+      location: {},
+      match: {},
+    },
+  }
+
+  const createContext = () => ({
+    context: { router, t: () => {} },
+    childContextTypes: { router: shape({}), t: () => {} },
+  })
+
+  return mount(node, createContext())
+}
diff --git a/test/lib/shallow-with-store.js b/test/lib/shallow-with-store.js
deleted file mode 100644
index 9df10a3c5..000000000
--- a/test/lib/shallow-with-store.js
+++ /dev/null
@@ -1,20 +0,0 @@
-const { shallow, mount } = require('enzyme')
-
-module.exports = {
-  shallowWithStore,
-  mountWithStore,
-}
-
-function shallowWithStore (component, store) {
-  const context = {
-    store,
-  }
-  return shallow(component, {context})
-}
-
-function mountWithStore (component, store) {
-  const context = {
-    store,
-  }
-  return mount(component, {context})
-}