Skip to content

chore: redirect to the correct template page routes #14230

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

Merged
merged 9 commits into from
Aug 12, 2024
Merged

chore: redirect to the correct template page routes #14230

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bcc6636
feat: show organization information on templates page
aslilac Aug 9, 2024
4fc07cb
add story
aslilac Aug 9, 2024
54901e3
🧹
aslilac Aug 9, 2024
4b9d029
chore: enforce correct template page routes
aslilac Aug 9, 2024
ff0101b
well ok then
aslilac Aug 9, 2024
f8b48f9
Merge branch 'main' into templates-redirect
aslilac Aug 12, 2024
132bc79
test!
aslilac Aug 12, 2024
1b4c881
ywdigydmf
aslilac Aug 12, 2024
2281908
:(
aslilac Aug 12, 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
Prev Previous commit
Next Next commit
test!
  • Loading branch information
@aslilac
aslilac committed Aug 12, 2024
commit 132bc79efda27e91678c184801c8c592dda0d8b8
40 changes: 40 additions & 0 deletions site/src/pages/TemplatePage/TemplateRedirectController.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import { API } from "api/api";
import * as M from "testHelpers/entities";
import { TemplateRedirectController } from "./TemplateRedirectController";
import { renderWithAuth } from "testHelpers/renderHelpers";
import { waitFor } from "@testing-library/react";

const renderTemplateRedirectController = (route: string) => {
return renderWithAuth(<TemplateRedirectController />, {
route,
path: "/templates/:organization?/:template",
});
};

it("redirects from multi-org to single-org", async () => {
const page = renderTemplateRedirectController(

Check failure on line 15 in site/src/pages/TemplatePage/TemplateRedirectController.test.tsx

View workflow job for this annotation

GitHub Actions / fmt 

`page` is not a recommended name for `render` returned value. Instead, you should destructure it, or name it using one of: `view`, or `utils`
`/templates/${M.MockTemplate.organization_name}/${M.MockTemplate.name}`,
);

await waitFor(() =>
expect(page.router.state.location.pathname).toEqual(
`/templates/${M.MockTemplate.name}`,
),
);
});

it("redirects from single-org to multi-org", async () => {
jest
.spyOn(API, "getOrganizations")
.mockResolvedValueOnce([M.MockDefaultOrganization, M.MockOrganization2]);

const page = renderTemplateRedirectController(

Check failure on line 31 in site/src/pages/TemplatePage/TemplateRedirectController.test.tsx

View workflow job for this annotation

GitHub Actions / fmt 

`page` is not a recommended name for `render` returned value. Instead, you should destructure it, or name it using one of: `view`, or `utils`
`/templates/${M.MockTemplate.name}`,
);

await waitFor(() =>
expect(page.router.state.location.pathname).toEqual(
`/templates/${M.MockDefaultOrganization.name}/${M.MockTemplate.name}`,
),
);
});
Loading