fixed failing tests

scm-ui/src/users/containers/DeleteUserButton.js

@@ -46,7 +46,7 @@ class DeleteUserButton extends React.Component<Props> {
     const action = confirmDialog ? this.confirmDelete : this.deleteUser;
 
     if (!this.isDeletable()) {
-      return;
+      return null;
     }
     return (
       <DeleteButton label="Delete" action={action} loading={entry.loading} />

scm-ui/src/users/containers/DeleteUserButton.test.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { configure, shallow } from "enzyme";
+import { configure, mount, shallow } from "enzyme";
 import DeleteUserButton from "./DeleteUserButton";
 import Adapter from "enzyme-adapter-react-16";
 
@@ -12,42 +12,51 @@ configure({ adapter: new Adapter() });
 
 describe("DeleteUserButton", () => {
   it("should render nothing, if the delete link is missing", () => {
-    const user = {
+    const entry = {
+      entry: {
         _links: {}
+      }
     };
 
     const button = shallow(
-      <DeleteUserButton user={user} deleteUser={() => {}} />
+      <DeleteUserButton entry={entry} deleteUser={() => {}} />
     );
     expect(button.text()).toBe("");
   });
 
   it("should render the button", () => {
-    const user = {
+    const entry = {
+      entry: {
         _links: {
           delete: {
             href: "/users"
           }
         }
+      }
     };
 
-    const button = shallow(
+    const button = mount(
-      <DeleteUserButton user={user} deleteUser={() => {}} />
+      <DeleteUserButton entry={entry} deleteUser={() => {}} />
     );
+
+    console.log(button);
+
     expect(button.text()).not.toBe("");
   });
 
   it("should open the confirm dialog on button click", () => {
-    const user = {
+    const entry = {
+      entry: {
         _links: {
           delete: {
             href: "/users"
           }
         }
+      }
     };
 
-    const button = shallow(
+    const button = mount(
-      <DeleteUserButton user={user} deleteUser={() => {}} />
+      <DeleteUserButton entry={entry} deleteUser={() => {}} />
     );
     button.simulate("click");
 
@@ -55,12 +64,14 @@ describe("DeleteUserButton", () => {
   });
 
   it("should call the delete user function with delete url", () => {
-    const user = {
+    const entry = {
+      entry: {
         _links: {
           delete: {
             href: "/users"
           }
         }
+      }
     };
 
     let calledUrl = null;
@@ -68,9 +79,9 @@ describe("DeleteUserButton", () => {
       calledUrl = user._links.delete.href;
     }
 
-    const button = shallow(
+    const button = mount(
       <DeleteUserButton
-        user={user}
+        entry={entry}
         confirmDialog={false}
         deleteUser={capture}
       />

scm-ui/src/users/containers/EditUserButton.test.js

@@ -8,24 +8,27 @@ import "raf/polyfill";
 configure({ adapter: new Adapter() });
 
 it("should render nothing, if the edit link is missing", () => {
-  const user = {
+  const entry = {
+    entry: {
       _links: {}
+    }
   };
 
-  const button = shallow(<EditUserButton user={user} />);
+  const button = shallow(<EditUserButton entry={entry} />);
   expect(button.text()).toBe("");
 });
 
 it("should render the button", () => {
-  const user = {
+  const entry = {
+    entry: {
       _links: {
         update: {
           href: "/users"
         }
       }
+    }
   };
 
-  const button = shallow(<EditUserButton user={user} />);
+  const button = shallow(<EditUserButton entry={entry} />);
   expect(button.text()).not.toBe("");
 });
-