Merge upstream 2.0ish #165

1 files changed, 5 insertions, 3 deletions

diff --git a/spec/javascript/setup.js b/spec/javascript/setup.js
index c9c8aed07..ab8a36b95 100644
--- a/spec/javascript/setup.js
+++ b/spec/javascript/setup.js
@@ -1,11 +1,13 @@
 import { JSDOM } from 'jsdom';
-import chai from 'chai';
-import chaiEnzyme from 'chai-enzyme';
-chai.use(chaiEnzyme());
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+Enzyme.configure({ adapter: new Adapter() });
 
 const { window } = new JSDOM('', {
   userAgent: 'node.js',
 });
+
 Object.keys(window).forEach(property => {
   if (typeof global[property] === 'undefined') {
     global[property] = window[property];