Skip to content

Scheduling infrastructure for absolutely everyone.

fix: Cal.diy followups (#28904)

Benny Jooae0079d3e461
diff --git a/apps/api/v2/src/platform/calendars/controllers/calendars.controller.e2e-spec.ts b/apps/api/v2/src/platform/calendars/controllers/calendars.controller.e2e-spec.ts
index 0823329cc69..f5be356e54f 100644
--- a/apps/api/v2/src/platform/calendars/controllers/calendars.controller.e2e-spec.ts
+++ b/apps/api/v2/src/platform/calendars/controllers/calendars.controller.e2e-spec.ts
@@ -47,7 +47,10 @@ import { UsersModule } from "@/modules/users/users.module";
const CLIENT_REDIRECT_URI = "http://localhost:5555";
-describe("Platform Calendars Endpoints", () => {
+// biome-ignore lint/style/noProcessEnv: Need to check env availability before test setup
+const describeCalendars = process.env.GOOGLE_API_CREDENTIALS ? describe : describe.skip;
+
+describeCalendars("Platform Calendars Endpoints", () => {
let app: INestApplication;
let oAuthClient: PlatformOAuthClient;
diff --git a/apps/api/v2/src/platform/gcal/gcal.controller.e2e-spec.ts b/apps/api/v2/src/platform/gcal/gcal.controller.e2e-spec.ts
index 7fc4e6ef2a0..21bed6c4a87 100644
--- a/apps/api/v2/src/platform/gcal/gcal.controller.e2e-spec.ts
+++ b/apps/api/v2/src/platform/gcal/gcal.controller.e2e-spec.ts
@@ -20,7 +20,10 @@ import { UsersModule } from "@/modules/users/users.module";
const CLIENT_REDIRECT_URI = "http://localhost:5555";
-describe("Platform Gcal Endpoints", () => {
+// biome-ignore lint/style/noProcessEnv: Need to check env availability before test setup
+const describePlatformGcal = process.env.GOOGLE_API_CREDENTIALS ? describe : describe.skip;
+
+describePlatformGcal("Platform Gcal Endpoints", () => {
let app: INestApplication;
let oAuthClient: PlatformOAuthClient;
diff --git a/apps/web/playwright/signup.e2e.ts b/apps/web/playwright/signup.e2e.ts
index c10cffd15eb..8e636f5598a 100644
--- a/apps/web/playwright/signup.e2e.ts
+++ b/apps/web/playwright/signup.e2e.ts
@@ -4,6 +4,7 @@ import { APP_NAME, IS_MAILHOG_ENABLED } from "@calcom/lib/constants";
import prisma from "@calcom/prisma";
import type { Page } from "@playwright/test";
import { expect } from "@playwright/test";
+import { IS_GOOGLE_LOGIN_ENABLED } from "../server/lib/constants";
import { test } from "./lib/fixtures";
import { getEmailsReceivedByUser } from "./lib/testUtils";
@@ -27,6 +28,8 @@ test.describe("Signup Main Page Test", async () => {
});
test("Continue with google button must exist / work", async ({ page }) => {
+ // eslint-disable-next-line playwright/no-skipped-test
+ test.skip(!IS_GOOGLE_LOGIN_ENABLED, "It should only run if Google Login is installed");
const button = page.getByTestId("continue-with-google-button");
await expect(button).toBeVisible();
await expect(button).toBeEnabled();
diff --git a/packages/app-store/horizon-workrooms/config.json b/packages/app-store/horizon-workrooms/config.json
index 06cdf8a2e4b..f0237ea2e63 100644
--- a/packages/app-store/horizon-workrooms/config.json
+++ b/packages/app-store/horizon-workrooms/config.json
@@ -7,7 +7,7 @@
"url": "https://forwork.meta.com/de/en/horizon-workrooms/",
"variant": "conferencing",
"categories": ["conferencing"],
- "publisher": "Cal.diy, Inc",
+ "publisher": "Cal.com, Inc",
"email": "[email protected]",
"appData": {
"location": {
diff --git a/packages/ui/components/credits/credits.test.tsx b/packages/ui/components/credits/credits.test.tsx
index 7b38ffb90ba..d3cc9511c6c 100644
--- a/packages/ui/components/credits/credits.test.tsx
+++ b/packages/ui/components/credits/credits.test.tsx
@@ -16,7 +16,7 @@ describe("Tests for Credits component", () => {
test("Should render credits section with links", () => {
render(<Credits />);
- const creditsLinkElement = screen.getByRole("link", { name: /Cal\.diy, Inc\./i });
+ const creditsLinkElement = screen.getByRole("link", { name: /Cal\.com, Inc\./i });
expect(creditsLinkElement).toBeInTheDocument();
expect(creditsLinkElement).toHaveAttribute("href", "https://go.cal.com/credits");