Merge branch 'main' into testE2E-timezone
This commit is contained in:
commit
0752d9d264
|
@ -28,7 +28,6 @@ export const prepareRootMetadata = (recipe: RootMetadataRecipe): Metadata => ({
|
|||
{
|
||||
rel: "icon-mask",
|
||||
url: "/safari-pinned-tab.svg",
|
||||
// @ts-expect-error TODO available in the never Next.js version
|
||||
color: "#000000",
|
||||
},
|
||||
{
|
||||
|
|
|
@ -351,7 +351,7 @@ test.describe("Teams - Org", () => {
|
|||
|
||||
await page.goto(`/team/${team.slug}/${teamEventSlug}`);
|
||||
|
||||
await expect(page.locator('[data-testid="404-page"]')).toBeVisible();
|
||||
await expect(page.locator("text=This page could not be found")).toBeVisible();
|
||||
await doOnOrgDomain(
|
||||
{
|
||||
orgSlug: org.slug,
|
||||
|
|
|
@ -40,6 +40,8 @@ export const withPaidAppRedirect = async ({
|
|||
? {
|
||||
subscription_data: {
|
||||
trial_period_days: trialDays,
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-ignore - trial_settings isn't available cc @erik
|
||||
trial_settings: { end_behavior: { missing_payment_method: "cancel" } },
|
||||
},
|
||||
}
|
||||
|
|
|
@ -36,7 +36,7 @@ test.describe("Routing Forms", () => {
|
|||
await page.goto(`apps/routing-forms/route-builder/${formId}`);
|
||||
await disableForm(page);
|
||||
await gotoRoutingLink({ page, formId });
|
||||
await expect(page.locator("text=ERROR 404")).toBeVisible();
|
||||
await expect(page.locator("text=This page could not be found")).toBeVisible();
|
||||
});
|
||||
|
||||
test("should be able to edit the form", async ({ page }) => {
|
||||
|
|
|
@ -8,7 +8,9 @@ export const useCompatSearchParams = () => {
|
|||
Object.getOwnPropertyNames(params).forEach((key) => {
|
||||
searchParams.delete(key);
|
||||
|
||||
const param = params[key];
|
||||
// Though useParams is supposed to return a string/string[] as the key's value but it is found to return undefined as well.
|
||||
// Maybe it happens for pages dir when using optional catch-all routes.
|
||||
const param = params[key] || "";
|
||||
const paramArr = typeof param === "string" ? param.split("/") : param;
|
||||
|
||||
paramArr.forEach((p) => {
|
||||
|
|
Loading…
Reference in New Issue
Block a user