diff --git a/scm-ui/src/groups/components/DeleteGroup.test.js b/scm-ui/src/groups/components/DeleteGroup.test.js index 2364a196e8..043724d5f7 100644 --- a/scm-ui/src/groups/components/DeleteGroup.test.js +++ b/scm-ui/src/groups/components/DeleteGroup.test.js @@ -1,15 +1,20 @@ import React from "react"; import { mount, shallow } from "enzyme"; +import ReactRouterEnzymeContext from "react-router-enzyme-context"; + import "../../tests/enzyme"; -import "../../../tests/i18n"; +import "../../tests/i18n"; import DeleteGroup from "./DeleteGroup"; import { confirmAlert } from "@scm-manager/ui-components"; jest.mock("@scm-manager/ui-components", () => ({ confirmAlert: jest.fn(), - NavAction: require.requireActual("@scm-manager/ui-components").NavAction + Subtitle: require.requireActual("@scm-manager/ui-components").Subtitle, + DeleteButton: require.requireActual("@scm-manager/ui-components").DeleteButton })); +const options = new ReactRouterEnzymeContext(); + describe("DeleteGroupNavLink", () => { it("should render nothing, if the delete link is missing", () => { const group = { @@ -32,7 +37,8 @@ describe("DeleteGroupNavLink", () => { }; const navLink = mount( - {}} /> + {}} />, + options.get() ); expect(navLink.text()).not.toBe(""); }); @@ -47,9 +53,10 @@ describe("DeleteGroupNavLink", () => { }; const navLink = mount( - {}} /> + {}} />, + options.get() ); - navLink.find("a").simulate("click"); + navLink.find("button").simulate("click"); expect(confirmAlert.mock.calls.length).toBe(1); }); @@ -73,9 +80,10 @@ describe("DeleteGroupNavLink", () => { group={group} confirmDialog={false} deleteGroup={capture} - /> + />, + options.get() ); - navLink.find("a").simulate("click"); + navLink.find("button").simulate("click"); expect(calledUrl).toBe("/groups"); }); diff --git a/scm-ui/src/repos/components/DeleteRepo.test.js b/scm-ui/src/repos/components/DeleteRepo.test.js index 7985e02ef2..136cec6c03 100644 --- a/scm-ui/src/repos/components/DeleteRepo.test.js +++ b/scm-ui/src/repos/components/DeleteRepo.test.js @@ -1,5 +1,7 @@ import React from "react"; import { mount, shallow } from "enzyme"; +import ReactRouterEnzymeContext from "react-router-enzyme-context"; + import "../../tests/enzyme"; import "../../tests/i18n"; import DeleteRepo from "./DeleteRepo"; @@ -7,9 +9,12 @@ import DeleteRepo from "./DeleteRepo"; import { confirmAlert } from "@scm-manager/ui-components"; jest.mock("@scm-manager/ui-components", () => ({ confirmAlert: jest.fn(), - NavAction: require.requireActual("@scm-manager/ui-components").NavAction + Subtitle: require.requireActual("@scm-manager/ui-components").Subtitle, + DeleteButton: require.requireActual("@scm-manager/ui-components").DeleteButton })); +const options = new ReactRouterEnzymeContext(); + describe("DeleteRepo", () => { it("should render nothing, if the delete link is missing", () => { const repository = { @@ -32,7 +37,8 @@ describe("DeleteRepo", () => { }; const navLink = mount( - {}} /> + {}} />, + options.get() ); expect(navLink.text()).not.toBe(""); }); @@ -47,9 +53,10 @@ describe("DeleteRepo", () => { }; const navLink = mount( - {}} /> + {}} />, + options.get() ); - navLink.find("a").simulate("click"); + navLink.find("button").simulate("click"); expect(confirmAlert.mock.calls.length).toBe(1); }); @@ -73,9 +80,10 @@ describe("DeleteRepo", () => { repository={repository} confirmDialog={false} delete={capture} - /> + />, + options.get() ); - navLink.find("a").simulate("click"); + navLink.find("button").simulate("click"); expect(calledUrl).toBe("/repos"); }); diff --git a/scm-ui/src/repos/components/PermissionsNavLink.test.js b/scm-ui/src/repos/components/PermissionsNavLink.test.js index 5dddfe0cf4..3f6a95fe7d 100644 --- a/scm-ui/src/repos/components/PermissionsNavLink.test.js +++ b/scm-ui/src/repos/components/PermissionsNavLink.test.js @@ -33,6 +33,6 @@ describe("PermissionsNavLink", () => { , options.get() ); - expect(navLink.text()).toBe("repository-root.menu.permissions"); + expect(navLink.text()).toBe("repositoryRoot.menu.permissionsNavLink"); }); }); diff --git a/scm-ui/src/users/components/DeleteUser.test.js b/scm-ui/src/users/components/DeleteUser.test.js index e03aad5b49..312efe51d9 100644 --- a/scm-ui/src/users/components/DeleteUser.test.js +++ b/scm-ui/src/users/components/DeleteUser.test.js @@ -1,15 +1,20 @@ import React from "react"; import { mount, shallow } from "enzyme"; +import ReactRouterEnzymeContext from "react-router-enzyme-context"; + import "../../tests/enzyme"; -import "../../../tests/i18n"; +import "../../tests/i18n"; import DeleteUser from "./DeleteUser"; import { confirmAlert } from "@scm-manager/ui-components"; jest.mock("@scm-manager/ui-components", () => ({ confirmAlert: jest.fn(), - NavAction: require.requireActual("@scm-manager/ui-components").NavAction + Subtitle: require.requireActual("@scm-manager/ui-components").Subtitle, + DeleteButton: require.requireActual("@scm-manager/ui-components").DeleteButton })); +const options = new ReactRouterEnzymeContext(); + describe("DeleteUser", () => { it("should render nothing, if the delete link is missing", () => { const user = { @@ -32,7 +37,8 @@ describe("DeleteUser", () => { }; const navLink = mount( - {}} /> + {}} />, + options.get() ); expect(navLink.text()).not.toBe(""); }); @@ -47,9 +53,10 @@ describe("DeleteUser", () => { }; const navLink = mount( - {}} /> + {}} />, + options.get() ); - navLink.find("a").simulate("click"); + navLink.find("button").simulate("click"); expect(confirmAlert.mock.calls.length).toBe(1); }); @@ -73,9 +80,10 @@ describe("DeleteUser", () => { user={user} confirmDialog={false} deleteUser={capture} - /> + />, + options.get() ); - navLink.find("a").simulate("click"); + navLink.find("button").simulate("click"); expect(calledUrl).toBe("/users"); });