From 09924a03cb9a7e492f243326a2df7f2b36d0e4cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Tue, 11 Sep 2018 16:17:11 +0200
Subject: [PATCH] enable failing tests again and use form instead of table for
 create permission

---
 .../components/PermissionsNavLink.test.js     |  6 +-
 .../components/CreatePermissionForm.js        | 69 ++++++++-----------
 .../buttons/DeletePermissionButton.js         |  5 +-
 3 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/scm-ui/src/repos/components/PermissionsNavLink.test.js b/scm-ui/src/repos/components/PermissionsNavLink.test.js
index b8b44f346a..c1c7d2e621 100644
--- a/scm-ui/src/repos/components/PermissionsNavLink.test.js
+++ b/scm-ui/src/repos/components/PermissionsNavLink.test.js
@@ -4,7 +4,11 @@ import "../../tests/enzyme";
 import "../../tests/i18n";
 import PermissionsNavLink from "./PermissionsNavLink";
 
-xdescribe("PermissionsNavLink", () => {
+jest.mock("@scm-manager/ui-components", () => ({
+  NavAction: require.requireActual("@scm-manager/ui-components").NavAction
+}));
+
+describe("PermissionsNavLink", () => {
   it("should render nothing, if the modify link is missing", () => {
     const repository = {
       _links: {}
diff --git a/scm-ui/src/repos/permissions/components/CreatePermissionForm.js b/scm-ui/src/repos/permissions/components/CreatePermissionForm.js
index 143f5f1065..417f3480fc 100644
--- a/scm-ui/src/repos/permissions/components/CreatePermissionForm.js
+++ b/scm-ui/src/repos/permissions/components/CreatePermissionForm.js
@@ -1,7 +1,11 @@
 // @flow
 import React from "react";
 import { translate } from "react-i18next";
-import { Checkbox, InputField, SubmitButton } from "../../../../../scm-ui-components/packages/ui-components/src/index";
+import {
+  Checkbox,
+  InputField,
+  SubmitButton
+} from "../../../../../scm-ui-components/packages/ui-components/src/index";
 import TypeSelector from "./TypeSelector";
 import type {
   PermissionCollection,
@@ -41,45 +45,30 @@ class CreatePermissionForm extends React.Component<Props, State> {
         <h2 className="subtitle">
           {t("add-permission.add-permission-heading")}
         </h2>
-        <table className="table">
-          <tbody>
-            <tr>
-              <td>{t("permission.name")}</td>
-              <td>
-                <InputField
-                  value={name ? name : ""}
-                  onChange={this.handleNameChange}
-                  validationError={this.currentPermissionIncludeName()}
-                  errorMessage={t("add-permission.name-input-invalid")}
-                />
-              </td>
-            </tr>
-            <tr>
-              <td>{t("permission.group-permission")}</td>
-              <td>
-                <Checkbox
-                  checked={groupPermission ? groupPermission : false}
-                  onChange={this.handleGroupPermissionChange}
-                />
-              </td>
-            </tr>
-            <tr>
-              <td>{t("permission.type")}</td>
-              <td>
-                <TypeSelector
-                  handleTypeChange={this.handleTypeChange}
-                  type={type ? type : "READ"}
-                />
-              </td>
-            </tr>
-          </tbody>
-        </table>
-        <SubmitButton
-          label={t("add-permission.submit-button")}
-          action={this.submit}
-          loading={loading}
-          disabled={this.isValid()}
-        />
+        <form onSubmit={this.submit}>
+          <InputField
+            label={t("permission.name")}
+            value={name ? name : ""}
+            onChange={this.handleNameChange}
+            validationError={this.currentPermissionIncludeName()}
+            errorMessage={t("add-permission.name-input-invalid")}
+          />
+          <Checkbox
+            label={t("permission.group-permission")}
+            checked={groupPermission ? groupPermission : false}
+            onChange={this.handleGroupPermissionChange}
+          />
+          <TypeSelector
+            label={t("permission.type")}
+            handleTypeChange={this.handleTypeChange}
+            type={type ? type : "READ"}
+          />
+          <SubmitButton
+            label={t("add-permission.submit-button")}
+            loading={loading}
+            disabled={this.isValid()}
+          />
+        </form>
       </div>
     );
   }
diff --git a/scm-ui/src/repos/permissions/components/buttons/DeletePermissionButton.js b/scm-ui/src/repos/permissions/components/buttons/DeletePermissionButton.js
index 540b606d67..25407e4f54 100644
--- a/scm-ui/src/repos/permissions/components/buttons/DeletePermissionButton.js
+++ b/scm-ui/src/repos/permissions/components/buttons/DeletePermissionButton.js
@@ -2,10 +2,7 @@
 import React from "react";
 import { translate } from "react-i18next";
 import type { Permission } from "../../types/Permissions";
-import {
-  confirmAlert,
-  DeleteButton
-} from "../../../../../../scm-ui-components/packages/ui-components/src/index";
+import { confirmAlert, DeleteButton } from "@scm-manager/ui-components";
 
 type Props = {
   permission: Permission,