merge 2.0.0-m3

This commit is contained in:
Maren Süwer
2018-10-18 08:37:35 +02:00
140 changed files with 34533 additions and 10482 deletions

View File

@@ -14,7 +14,7 @@ type Props = {
class TypeSelector extends React.Component<Props> {
render() {
const { t, type, handleTypeChange, loading, label, helpText } = this.props;
const { type, handleTypeChange, loading, label, helpText } = this.props;
const types = ["READ", "OWNER", "WRITE"];
return (

View File

@@ -5,12 +5,15 @@ import "../../../../tests/i18n";
import DeletePermissionButton from "./DeletePermissionButton";
import { confirmAlert } from "@scm-manager/ui-components";
import ReactRouterEnzymeContext from "react-router-enzyme-context";
jest.mock("@scm-manager/ui-components", () => ({
confirmAlert: jest.fn(),
DeleteButton: require.requireActual("@scm-manager/ui-components").DeleteButton
}));
describe("DeletePermissionButton", () => {
const options = new ReactRouterEnzymeContext();
it("should render nothing, if the delete link is missing", () => {
const permission = {
_links: {}
@@ -20,7 +23,8 @@ describe("DeletePermissionButton", () => {
<DeletePermissionButton
permission={permission}
deletePermission={() => {}}
/>
/>,
options.get()
);
expect(navLink.text()).toBe("");
});
@@ -38,7 +42,8 @@ describe("DeletePermissionButton", () => {
<DeletePermissionButton
permission={permission}
deletePermission={() => {}}
/>
/>,
options.get()
);
expect(navLink.text()).not.toBe("");
});
@@ -56,7 +61,8 @@ describe("DeletePermissionButton", () => {
<DeletePermissionButton
permission={permission}
deletePermission={() => {}}
/>
/>,
options.get()
);
button.find("button").simulate("click");
@@ -82,7 +88,8 @@ describe("DeletePermissionButton", () => {
permission={permission}
confirmDialog={false}
deletePermission={capture}
/>
/>,
options.get()
);
button.find("button").simulate("click");