Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(subnets): Use PrefixedIpInput in Reserve Range form MAASENG-3524 #5508

Merged
merged 2 commits into from
Aug 8, 2024
Merged

feat(subnets): Use PrefixedIpInput in Reserve Range form MAASENG-3524 #5508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c65a5eb
feat(subnets): Use PrefixedIpInput in Reserve Range form MAASENG-3524
ndv99 Jul 25, 2024
c4db879
remember to account for VLAN reserved ranges, which don't need this v…
ndv99 Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 85 additions & 15 deletions src/app/subnets/components/ReservedRangeForm/ReservedRangeForm.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { ipRangeActions } from "@/app/store/iprange";
import type { IPRange } from "@/app/store/iprange/types";
import { IPRangeType } from "@/app/store/iprange/types";
import type { RootState } from "@/app/store/root/types";
import type { Subnet } from "@/app/store/subnet/types";
import * as factory from "@/testing/factories";
import {
userEvent,
Expand All @@ -22,18 +23,24 @@ const mockStore = configureStore();
describe("ReservedRangeForm", () => {
let state: RootState;
let ipRange: IPRange;
let subnet: Subnet;

beforeEach(() => {
ipRange = factory.ipRange({
comment: "what a beaut",
start_ip: "11.1.1.1",
start_ip: "10.10.0.1",
end_ip: "10.10.0.100",
type: IPRangeType.Reserved,
user: "wombat",
});
subnet = factory.subnet({ cidr: "10.10.0.0/24" });
state = factory.rootState({
iprange: factory.ipRangeState({
items: [ipRange],
}),
subnet: factory.subnetState({
items: [subnet],
}),
});
});

Expand All @@ -48,6 +55,7 @@ describe("ReservedRangeForm", () => {
<ReservedRangeForm
ipRangeId={ipRange.id}
setSidePanelContent={vi.fn()}
subnetId={subnet.id}
/>
</MemoryRouter>
</Provider>
Expand All @@ -62,7 +70,10 @@ describe("ReservedRangeForm", () => {
<MemoryRouter
initialEntries={[{ pathname: "/machines", key: "testKey" }]}
>
<ReservedRangeForm setSidePanelContent={vi.fn()} />
<ReservedRangeForm
setSidePanelContent={vi.fn()}
subnetId={subnet.id}
/>
</MemoryRouter>
</Provider>
);
Expand All @@ -79,16 +90,17 @@ describe("ReservedRangeForm", () => {
<ReservedRangeForm
ipRangeId={ipRange.id}
setSidePanelContent={vi.fn()}
subnetId={subnet.id}
/>
</MemoryRouter>
</Provider>
);
expect(
screen.getByRole("textbox", { name: Labels.StartIp })
).toHaveAttribute("value", ipRange.start_ip);
).toHaveAttribute("value", ipRange.start_ip.split(".")[-1]); // value should only be the last octet of the address
expect(screen.getByRole("textbox", { name: Labels.EndIp })).toHaveAttribute(
"value",
ipRange.end_ip
ipRange.end_ip.split(".")[-1] // value should only be the last octet of the address
);
expect(
screen.getByRole("textbox", { name: Labels.Comment })
Expand All @@ -107,6 +119,7 @@ describe("ReservedRangeForm", () => {
<ReservedRangeForm
ipRangeId={ipRange.id}
setSidePanelContent={vi.fn()}
subnetId={subnet.id}
/>
</MemoryRouter>
</Provider>
Expand All @@ -129,18 +142,18 @@ describe("ReservedRangeForm", () => {
<ReservedRangeForm
createType={IPRangeType.Reserved}
setSidePanelContent={vi.fn()}
subnetId={1}
subnetId={subnet.id}
/>
</MemoryRouter>
</Provider>
);
await userEvent.type(
screen.getByRole("textbox", { name: Labels.StartIp }),
"1.1.1.1"
"1"
);
await userEvent.type(
screen.getByRole("textbox", { name: Labels.EndIp }),
"1.1.1.2"
"99"
);
await userEvent.type(
screen.getByRole("textbox", { name: Labels.Comment }),
Expand All @@ -149,9 +162,9 @@ describe("ReservedRangeForm", () => {
await userEvent.click(screen.getByRole("button", { name: "Reserve" }));
const expected = ipRangeActions.create({
comment: "reserved",
end_ip: "1.1.1.2",
start_ip: "1.1.1.1",
subnet: 1,
start_ip: "10.10.0.1",
end_ip: "10.10.0.99",
subnet: subnet.id,
type: IPRangeType.Reserved,
});
await waitFor(() =>
Expand All @@ -171,19 +184,20 @@ describe("ReservedRangeForm", () => {
<ReservedRangeForm
ipRangeId={ipRange.id}
setSidePanelContent={vi.fn()}
subnetId={subnet.id}
/>
</MemoryRouter>
</Provider>
);
const startIpField = screen.getByRole("textbox", { name: Labels.StartIp });
await userEvent.clear(startIpField);
await userEvent.type(startIpField, "1.2.3.4");
await userEvent.type(startIpField, "20");
await userEvent.click(screen.getByRole("button", { name: "Save" }));
const expected = ipRangeActions.update({
comment: ipRange.comment,
end_ip: ipRange.end_ip,
id: ipRange.id,
start_ip: "1.2.3.4",
start_ip: "10.10.0.20",
});
await waitFor(() =>
expect(
Expand All @@ -204,19 +218,20 @@ describe("ReservedRangeForm", () => {
<ReservedRangeForm
ipRangeId={ipRange.id}
setSidePanelContent={vi.fn()}
subnetId={subnet.id}
/>
</MemoryRouter>
</Provider>
);
const startIpField = screen.getByRole("textbox", { name: Labels.StartIp });
await userEvent.clear(startIpField);
await userEvent.type(startIpField, "1.2.3.4");
await userEvent.type(startIpField, "4");
await userEvent.click(screen.getByRole("button", { name: "Save" }));
const expected = ipRangeActions.update({
comment: ipRange.comment,
end_ip: ipRange.end_ip,
id: ipRange.id,
start_ip: "1.2.3.4",
start_ip: "10.10.0.4",
});
await waitFor(() => {
const actual = store
Expand All @@ -238,6 +253,7 @@ describe("ReservedRangeForm", () => {
<ReservedRangeForm
createType={IPRangeType.Dynamic}
setSidePanelContent={vi.fn()}
subnetId={subnet.id}
/>
</MemoryRouter>
</Provider>
Expand All @@ -249,7 +265,7 @@ describe("ReservedRangeForm", () => {

it("displays an error when start and end IP addresses are not provided", async () => {
renderWithBrowserRouter(
<ReservedRangeForm setSidePanelContent={vi.fn()} />,
<ReservedRangeForm setSidePanelContent={vi.fn()} subnetId={subnet.id} />,
{
state,
route: "/machines",
Expand All @@ -267,4 +283,58 @@ describe("ReservedRangeForm", () => {
await screen.findByLabelText(Labels.EndIp)
).toHaveAccessibleErrorMessage(/End IP is required/);
});

it("displays an error when an invalid IP address is entered", async () => {
renderWithBrowserRouter(
<ReservedRangeForm setSidePanelContent={vi.fn()} subnetId={subnet.id} />,
{
state,
route: "/machines",
}
);
await userEvent.type(
screen.getByRole("textbox", { name: Labels.StartIp }),
"abc"
);
await userEvent.type(
screen.getByRole("textbox", { name: Labels.EndIp }),
"abc"
);
await userEvent.click(screen.getByRole("button", { name: "Reserve" }));
expect(
await screen.findByLabelText(Labels.StartIp)
).toHaveAccessibleErrorMessage(/This is not a valid IP address/);
expect(
await screen.findByLabelText(Labels.EndIp)
).toHaveAccessibleErrorMessage(/This is not a valid IP address/);
});

it("displays an error when an out-of-range IP address is entered", async () => {
renderWithBrowserRouter(
<ReservedRangeForm setSidePanelContent={vi.fn()} subnetId={subnet.id} />,
{
state,
route: "/machines",
}
);
await userEvent.type(
screen.getByRole("textbox", { name: Labels.StartIp }),
"0"
);
await userEvent.type(
screen.getByRole("textbox", { name: Labels.EndIp }),
"255"
);
await userEvent.click(screen.getByRole("button", { name: "Reserve" }));
expect(
await screen.findByLabelText(Labels.StartIp)
).toHaveAccessibleErrorMessage(
/The IP address is outside of the subnet's range/
);
expect(
await screen.findByLabelText(Labels.EndIp)
).toHaveAccessibleErrorMessage(
/The IP address is outside of the subnet's range/
);
});
});
Loading
Loading