Skip to content

fix: Cal.diy followups#28904

Merged
hbjORbj merged 4 commits intomainfrom
cal-diy-followup
Apr 15, 2026
Merged

fix: Cal.diy followups#28904
hbjORbj merged 4 commits intomainfrom
cal-diy-followup

Conversation

@hbjORbj
Copy link
Copy Markdown
Contributor

@hbjORbj hbjORbj commented Apr 15, 2026

@vercel
Copy link
Copy Markdown

vercel bot commented Apr 15, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
docs Error Error Apr 15, 2026 1:03pm

Request Review

@github-actions
Copy link
Copy Markdown
Contributor

Welcome to Cal.diy, @hbjORbj! Thanks for opening this pull request.

A few things to keep in mind:

  • This is Cal.diy, not Cal.com. Cal.diy is a community-driven, fully open-source fork of Cal.com licensed under MIT. Your changes here will be part of Cal.diy — they will not be deployed to the Cal.com production app.
  • Please review our Contributing Guidelines if you haven't already.
  • Make sure your PR title follows the Conventional Commits format.

A maintainer will review your PR soon. Thanks for contributing!

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai bot commented Apr 15, 2026

📝 Walkthrough

Walkthrough

The PR makes test execution conditional: two backend e2e suites switch between describe and describe.skip based on process.env.GOOGLE_API_CREDENTIALS, and a Playwright signup test uses test.skip when IS_GOOGLE_LOGIN_ENABLED is false. It also updates branding: packages/app-store/horizon-workrooms/config.json publisher changed to "Cal.com, Inc", and the Credits component test now expects "Cal.com, Inc."

🚥 Pre-merge checks | ✅ 1 | ❌ 2

❌ Failed checks (2 inconclusive)

Check name Status Explanation Resolution
Title check ❓ Inconclusive The title 'fix: Cal.diy followups' is vague and generic, using 'followups' without specifying what aspects of Cal.diy are being addressed or what the actual changes accomplish. Replace with a more specific title that describes the actual changes, such as 'fix: Update publisher names from Cal.diy to Cal.com and conditionally skip environment-dependent tests'.
Description check ❓ Inconclusive The description 'Follow-ups of #28903' is minimally related to the changeset but extremely vague, providing no meaningful information about what was changed or why. Expand the description to explain the changes: publisher name updates, conditional test execution based on environment variables, and the rationale for these modifications.
✅ Passed checks (1 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch cal-diy-followup

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

PeerRich
PeerRich previously approved these changes Apr 15, 2026
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick comments (1)
apps/api/v2/src/platform/calendars/controllers/calendars.controller.e2e-spec.ts (1)

51-53: Scope env-based skipping to Google-only tests, not the full suite.

This currently disables all calendar e2e tests when GOOGLE_API_CREDENTIALS is missing, including non-Google scenarios. Keep the top-level suite active and gate only Google-dependent cases.

♻️ Suggested refactor
-const describeCalendars = process.env.GOOGLE_API_CREDENTIALS ? describe : describe.skip;
-
-describeCalendars("Platform Calendars Endpoints", () => {
+const hasGoogleCredentials = Boolean(process.env.GOOGLE_API_CREDENTIALS?.trim());
+const describeGoogleCalendars = hasGoogleCredentials ? describe : describe.skip;
+
+describe("Platform Calendars Endpoints", () => {
// Then wrap only Google-specific specs:
describeGoogleCalendars("Google calendar flows", () => {
  // google connect/check/busy-times tests
});
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In
`@apps/api/v2/src/platform/calendars/controllers/calendars.controller.e2e-spec.ts`
around lines 51 - 53, The top-level suite is being skipped via describeCalendars
(using process.env.GOOGLE_API_CREDENTIALS ? describe : describe.skip), which
disables all calendar e2e tests; instead keep the main describe("Platform
Calendars Endpoints", ...) always active and only gate Google-specific tests by
creating a conditional wrapper (e.g., describeGoogleCalendars or using
process.env.GOOGLE_API_CREDENTIALS ? describe : describe.skip) around the
Google-only specs (connect/check/busy-times) so non-Google scenarios still run;
update the file to remove the describeCalendars wrapper around the entire suite
and apply the conditional wrapper only to the Google-specific describe blocks.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Nitpick comments:
In
`@apps/api/v2/src/platform/calendars/controllers/calendars.controller.e2e-spec.ts`:
- Around line 51-53: The top-level suite is being skipped via describeCalendars
(using process.env.GOOGLE_API_CREDENTIALS ? describe : describe.skip), which
disables all calendar e2e tests; instead keep the main describe("Platform
Calendars Endpoints", ...) always active and only gate Google-specific tests by
creating a conditional wrapper (e.g., describeGoogleCalendars or using
process.env.GOOGLE_API_CREDENTIALS ? describe : describe.skip) around the
Google-only specs (connect/check/busy-times) so non-Google scenarios still run;
update the file to remove the describeCalendars wrapper around the entire suite
and apply the conditional wrapper only to the Google-specific describe blocks.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 05c75a70-77da-4369-8b2e-28fa81429731

📥 Commits

Reviewing files that changed from the base of the PR and between 71747a6 and b525c16.

📒 Files selected for processing (1)
  • apps/api/v2/src/platform/calendars/controllers/calendars.controller.e2e-spec.ts

@hbjORbj hbjORbj merged commit ae0079d into main Apr 15, 2026
37 checks passed
@hbjORbj hbjORbj deleted the cal-diy-followup branch April 15, 2026 13:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants