merged med master og lagt til i changelog og upped version number

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v3.2.0
+* Removed button and replaced with div to fix biug in internet explorer
+
+
+## v3.1.0
+* Upgraded to react 16. Enzyme to 3.1.1 to support react 16. Added repository to remove warning. 
+Upgraded ffe-accordian to remove warning. 
+
 ## v3.0.1
 * Fix a propType error that would happen if isOpen was not set on AccordionItem. Collapse complained that
 `this.state.isOpen` was undefined, so it now defaults to the boolean `false`.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ffe-accordion-react",
-  "version": "3.0.1",
+  "version": "3.2.0",
   "main": "lib/index.js",
   "scripts": {
     "build": "babel -d lib/. --ignore=*.test.js src/. && npm run example",
@@ -17,16 +17,16 @@
     "postpublish": "git tag ${npm_package_version} && git push --tags"
   },
   "peerDependencies": {
-    "react": "^0.14.0 || ^15.0.0",
+    "ffe-accordion": "^3.0.0",
     "ffe-core": "*",
-    "ffe-accordion": "^3.0.0"
+    "react": "^0.14.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
     "classnames": "^2.2.5",
-    "ffe-icons-react": "^2.4.13",
-    "prop-types": "*",
+    "ffe-icons-react": "^2.4.17",
+    "prop-types": "^15.6.0",
     "react-collapse": "^4.0.3",
-    "react-motion": "^0.5.1",
+    "react-motion": "^0.5.2",
     "uuid": "^3.1.0"
   },
   "devDependencies": {
@@ -39,21 +39,21 @@
     "babelify": "^7.3.0",
     "budo": "8.3.0",
     "chai": "^3.5.0",
-    "enzyme": "^2.0.0",
-    "eslint": "^3.12.2",
+    "enzyme": "^3.1.1",
+    "enzyme-adapter-react-16": "^1.0.4",
+    "eslint": "3.12.2",
     "eslint-config-ffe": "^6.0.0",
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "^3.0.2",
     "eslint-plugin-react": "^6.8.0",
+    "ffe-accordion": "^3.0.0",
     "ffe-core": "^10.1.1",
-    "ffe-accordion": "^2.0.1",
     "mocha": "^3.2.0",
     "node-lessify": "^0.1.4",
     "nsp": "^2.2.0",
     "onchange": "3.2.1",
-    "react": "^15.0.0",
-    "react-addons-test-utils": "^15.0.0",
-    "react-dom": "^15.0.0",
+    "react": "^16.0.0",
+    "react-dom": "^16.0.0",
     "sinon": "^2.1.0"
   },
   "publishConfig": {
@@ -64,7 +64,7 @@
     "example.html",
     "*.js"
   ],
-  "repository": "",
+  "repository": "***REMOVED***",
   "author": "SpareBank 1",
   "license": "ISC"
 }

src/accordion.test.js

@@ -1,11 +1,13 @@
 /*eslint-env mocha*/
+import Adapter from 'enzyme-adapter-react-16';
 import { assert } from 'chai';
 import { whiteAccordion, blueAccordion } from '../docs/example-component';
 import { AccordionItem, WhiteAccordion } from '../src/';
-import { shallow, render } from 'enzyme';
+import Enzyme, { shallow, render } from 'enzyme';
 import React from 'react';
 import sinon from 'sinon';
 
+Enzyme.configure({ adapter: new Adapter() });
 const wrapperHasContent = (wrapper, content) => new RegExp(content).test(wrapper.html());
 
 describe('ffe-accordion-react', () => {