update tests

src/app/components/elements/Author/spec.js

@@ -3,6 +3,12 @@ import { Provider } from 'react-redux';
 import { createStore } from 'redux';
 import Author from "./index";
 import rootReducer from 'app/redux/RootReducer';
+import { configure, shallow } from "enzyme";
+
+import Adapter from 'enzyme-adapter-react-15';
+
+
+configure({ adapter: new Adapter() });
 
 const store = createStore(rootReducer);
 

src/app/components/elements/Follow/spec.js

 import React from "react";
-import { mount, shallow } from "enzyme";
+import { mount, configure, shallow } from "enzyme";
 import { Provider } from 'react-redux';
 import { createStore } from 'redux';
 import Follow from "./index";
 import rootReducer from 'app/redux/RootReducer';
+import Adapter from 'enzyme-adapter-react-15';
 
 const store = createStore(rootReducer);
 
+configure({ adapter: new Adapter() });
+
 describe("<Follow />", () => {
 
   const wrapper = shallow(<Provider store={store}><Follow /></Provider>);

src/app/redux/TransactionSaga.test.js

@@ -14,6 +14,11 @@ import {
 } from './TransactionSaga';
 import { DEBT_TICKER } from 'app/client_config';
 
+import { configure, shallow } from 'enzyme';
+import Adapter from 'enzyme-adapter-react-15';
+
+configure({ adapter: new Adapter() });
+
 const operation = {
     type: 'comment',
     author: 'Alice',

src/shared/HtmlReady.test.js

@@ -6,17 +6,9 @@ beforeEach(() => {
 });
 
 describe('htmlready', () => {
-<<<<<<< HEAD
-    it('should throw an error if the input cannot be parsed', () => {
-        const teststring = 'teststring lol'; // this string causes the xmldom parser to fail & error out
-        expect(() => HtmlReady(teststring).html).toThrow(
-            'HtmlReady: xmldom error'
-        );
-=======
     it('should return an empty string if input cannot be parsed', () => {
         const teststring = 'teststring lol'; // this string causes the xmldom parser to fail & error out
         expect(HtmlReady(teststring).html).toEqual('');
->>>>>>> 08185985ce6ff3a5f7394df7c1148745e995820b
     });
 
     it('should allow links where the text portion and href contains steemit.com', () => {