Merge branch 'main' into yarn-lock-changes

Author: keithwillcode

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;

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;

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();

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": "support@cal.com",
   "appData": {
     "location": {

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");