maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into testE2E-timezone

This commit is contained in:
GitStart-Cal.com 2023-11-23 19:05:06 +05:45 committed by GitHub
parent 457dfa645d de479bb2da
commit 0752d9d264
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/web/lib/metadata.ts
View File

@ -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",
},
{

2
apps/web/playwright/teams.e2e.ts
View File

@ -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,

2
packages/app-store/_utils/paid-apps.ts
View File

@ -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" } },
},
}

2
packages/app-store/routing-forms/playwright/tests/basic.e2e.ts
View File

@ -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 }) => {

4
packages/lib/hooks/useCompatSearchParams.tsx
View File

@ -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) => {