aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Huang <thomas.b.huang@gmail.com>2017-11-26 08:37:12 +0800
committerThomas Huang <thomas.b.huang@gmail.com>2017-11-26 08:37:12 +0800
commitcefe6cded6728ff95d951435430da311356c3b23 (patch)
treee37ae935d5a6741f97aeea18f6a128518c3645fb
parent28409294c3cd70ddbc9a9f3467d402c89e110261 (diff)
downloadtangerine-wallet-browser-cefe6cded6728ff95d951435430da311356c3b23.tar
tangerine-wallet-browser-cefe6cded6728ff95d951435430da311356c3b23.tar.gz
tangerine-wallet-browser-cefe6cded6728ff95d951435430da311356c3b23.tar.bz2
tangerine-wallet-browser-cefe6cded6728ff95d951435430da311356c3b23.tar.lz
tangerine-wallet-browser-cefe6cded6728ff95d951435430da311356c3b23.tar.xz
tangerine-wallet-browser-cefe6cded6728ff95d951435430da311356c3b23.tar.zst
tangerine-wallet-browser-cefe6cded6728ff95d951435430da311356c3b23.zip
Update to Enzyme 3.2.0
-rw-r--r--package.json3
-rw-r--r--test/helper.js4
-rw-r--r--test/lib/shallow-with-store.js15
-rw-r--r--test/unit/components/balance-component-test.js2
-rw-r--r--test/unit/components/pending-tx-test.js2
-rw-r--r--test/unit/responsive/components/dropdown-test.js6
6 files changed, 21 insertions, 11 deletions
diff --git a/package.json b/package.json
index 12c839739..27fea1495 100644
--- a/package.json
+++ b/package.json
@@ -187,7 +187,8 @@
"deep-freeze-strict": "^1.1.1",
"del": "^3.0.0",
"envify": "^4.0.0",
- "enzyme": "^2.8.2",
+ "enzyme": "^3.2.0",
+ "enzyme-adapter-react-15": "^1.0.5",
"eslint-plugin-chai": "0.0.1",
"eslint-plugin-mocha": "^4.9.0",
"eslint-plugin-react": "^7.4.0",
diff --git a/test/helper.js b/test/helper.js
index 1c5934a89..a3abbebf2 100644
--- a/test/helper.js
+++ b/test/helper.js
@@ -1,3 +1,7 @@
+import Enzyme from 'enzyme'
+import Adapter from 'enzyme-adapter-react-15'
+
+Enzyme.configure({ adapter: new Adapter() })
// disallow promises from swallowing errors
enableFailureOnUnhandledPromiseRejection()
diff --git a/test/lib/shallow-with-store.js b/test/lib/shallow-with-store.js
index 411aa0455..2a66adb17 100644
--- a/test/lib/shallow-with-store.js
+++ b/test/lib/shallow-with-store.js
@@ -1,11 +1,16 @@
-const shallow = require('enzyme').shallow
+const { shallow, mount } = require('enzyme')
-module.exports = shallowWithStore
-
-function shallowWithStore (component, store) {
+exports.shallowWithStore = function shallowWithStore (component, store) {
const context = {
store,
}
return shallow(component, { context })
-};
+}
+
+exports.mountWithStore = function mountWithStore (component, store) {
+ const context = {
+ store,
+ }
+ return mount(component, { context })
+}
diff --git a/test/unit/components/balance-component-test.js b/test/unit/components/balance-component-test.js
index a5fededc8..9b1e82acf 100644
--- a/test/unit/components/balance-component-test.js
+++ b/test/unit/components/balance-component-test.js
@@ -1,7 +1,7 @@
const assert = require('assert')
const h = require('react-hyperscript')
const { createMockStore } = require('redux-test-utils')
-const shallowWithStore = require('../../lib/shallow-with-store')
+const { shallowWithStore } = require('../../lib/shallow-with-store')
const BalanceComponent = require('../../../ui/app/components/balance-component')
const mockState = {
metamask: {
diff --git a/test/unit/components/pending-tx-test.js b/test/unit/components/pending-tx-test.js
index 97cac3216..c6c588e1c 100644
--- a/test/unit/components/pending-tx-test.js
+++ b/test/unit/components/pending-tx-test.js
@@ -4,7 +4,7 @@ const PendingTx = require('../../../ui/app/components/pending-tx')
const ethUtil = require('ethereumjs-util')
const { createMockStore } = require('redux-test-utils')
-const shallowWithStore = require('../../lib/shallow-with-store')
+const { shallowWithStore } = require('../../lib/shallow-with-store')
const identities = { abc: {}, def: {} }
const mockState = {
diff --git a/test/unit/responsive/components/dropdown-test.js b/test/unit/responsive/components/dropdown-test.js
index 932b6c752..982d8c6ec 100644
--- a/test/unit/responsive/components/dropdown-test.js
+++ b/test/unit/responsive/components/dropdown-test.js
@@ -6,7 +6,7 @@ const path = require('path');
const Dropdown = require(path.join(__dirname, '..', '..', '..', '..', 'ui', 'app', 'components', 'dropdowns', 'index.js')).Dropdown;
const { createMockStore } = require('redux-test-utils')
-const shallowWithStore = require('../../../lib/shallow-with-store')
+const { mountWithStore } = require('../../../lib/shallow-with-store')
const mockState = {
metamask: {
@@ -39,7 +39,7 @@ describe('Dropdown components', function () {
onClick = sinon.spy();
store = createMockStore(mockState)
- component = shallowWithStore(h(
+ component = mountWithStore(h(
Dropdown,
dropdownComponentProps,
[
@@ -57,7 +57,7 @@ describe('Dropdown components', function () {
}, 'Item 2'),
]
), store)
- dropdownComponent = component.dive()
+ dropdownComponent = component
})
it('can render two items', function () {