Merge pull request #12 from kkoscielniak/fix-tests

Fix linter and tests
brainhubeu · Sep 26, 2018 · 83550c5 · 83550c5
2 parents c22cab6 + daa5a11
commit 83550c5
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/lib/react-permissible.js b/lib/react-permissible.js
diff --git a/src/components/permissible.js b/src/components/permissible.js
@@ -20,7 +20,9 @@ export function Permissible(
       history: PropTypes.object, // eslint-disable-line react/forbid-prop-types
     };
 
-    componentWillMount() {
+    constructor(props) {
+      super(props);
+
       if (!permissionsStatus) {
         this.runCallback();
       }

diff --git a/src/components/permissibleRender.js b/src/components/permissibleRender.js
@@ -10,7 +10,7 @@ export class PermissibleRender extends Component {
     requiredPermissions: PropTypes.arrayOf(PropTypes.string).isRequired,
     children: PropTypes.element.isRequired,
     renderOtherwise: PropTypes.element,
-  }
+  };
 
   checkPermissions() {
     const { userPermissions, requiredPermissions, oneperm } = this.props;

diff --git a/test/accessible.component.js b/test/accessible.component.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const Accessible = ({ permission, oneperm }) => (
+  <div className="accessible-component">
+    <p>
+      {oneperm ? 'One of' : 'Whole set of'} <code>{permission}</code> is necessary to see this component.
+    </p>
+  </div>
+);
+
+Accessible.propTypes = {
+  permission: PropTypes.string,
+  oneperm: PropTypes.bool,
+};
+
+export default Accessible;
diff --git a/test/permissible.test.js b/test/permissible.test.js
@@ -5,7 +5,7 @@ import chaiEnzyme from 'chai-enzyme';
 import { JSDOM } from 'jsdom';
 
 import { Permissible } from '../src/components/permissible';
-import AccessedComponent from '../example/components/accessibleComponent.component';
+import AccessedComponent from './accessible.component';
 
 const { document } = (new JSDOM('')).window;
 global.document = document;

diff --git a/test/permissibleRender.test.js b/test/permissibleRender.test.js
@@ -64,9 +64,7 @@ describe('PermissibleRender', () => {
     };
 
     const mountedComponent = mount(
-      <PermissibleRender {...props}>
-
-      </PermissibleRender>
+      <PermissibleRender {...props} />
     );
 
     should.not.exist(mountedComponent.find('PermissibleRender').html());