2 Commits

Include renames

Author	SHA1	Message	Date
3 people	4291a59b2c	fix: add missing vi.mock() calls to prevent vitest worker shutdown flakiness (#28459) ... * fix: add missing vi.mock() calls to prevent vitest worker shutdown flakiness Add vi.mock() calls for modules that trigger background network requests or database connections during import. These transitive imports can cause the vitest worker RPC to shut down while pending fetch/network operations are still in flight, resulting in flaky test failures with: Error: [vitest-worker]: Closing rpc while "fetch" was pending The primary modules mocked are: - @calcom/app-store/delegationCredential (triggers credential lookups) - @calcom/prisma (triggers database initialization) - @calcom/features/calendars/lib/CalendarManager (triggers calendar API calls) - @calcom/features/auth/lib/verifyEmail (triggers email service) - @calcom/lib/domainManager/organization (triggers domain lookups) Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: remove conflicting empty prisma mocks from files with prismock/prismaMock setups - Remove vi.mock('@calcom/prisma', () => ({ default: {}, prisma: {} })) from 28 files that already have prismock/prismaMock test doubles. Vitest hoists all vi.mock() calls and the last one wins, so these empty mocks were overriding the functional test doubles. - Fix CalendarSubscriptionService.test.ts to reuse the shared mock from __mocks__/delegationCredential instead of creating a new unconfigured vi.fn() - Remove DelegationCredentialRepository.test.ts empty prisma mock (different pattern) - Remove vi.mock from inside beforeEach in intentToCreateOrg.handler.test.ts Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: add comprehensive delegationCredential mock exports to prevent CI test failures The vi.mock blocks for @calcom/app-store/delegationCredential were missing exports that the code under test transitively imports (e.g. enrichUsersWithDelegationCredentials, enrichUserWithDelegationCredentialsIncludeServiceAccountKey, buildAllCredentials, getFirstDelegationConferencingCredentialAppLocation). Added all exports with passthrough implementations so the booking flow works correctly without triggering real network requests. Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: correct credential mock return shapes to match real module API Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fix: revert unintended yarn.lock changes Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>	2026-03-17 09:55:37 +05:30
Hariom BalharaandGitHub	50c5423ba7	fix: support underscores in workflow template variables with backward compatibility (#27571) ... ## What does this PR do? Fixes an issue where underscores in form field identifiers were being stripped when converting to workflow template variables. According to the documentation, users should be able to use variables like `{COMPANY_NAME}` or `{MONTHLY_INFRASTRUCTURE_SPEND}`, but the regex in `formatIdentifierToVariable` was removing underscores, causing these variables to not match. **The problem:** - Form field identifier: `Company_Name` or `Monthly_Infrastructure_Spend` - Expected variable: `{COMPANY_NAME}` or `{MONTHLY_INFRASTRUCTURE_SPEND}` - Actual variable (before fix): `{COMPANYNAME}` or `{MONTHLYINFRASTRUCTURESPEND}` **The fix:** - Updated the regex from `[^a-zA-Z0-9 ]` to `[^a-zA-Z0-9_ ]` to preserve underscores in `formatIdentifierToVariable` - Added a private `formatIdentifierToVariableLegacy` function that maintains the old behavior (strips underscores) - Added `getVariableFormats` helper that returns both current and legacy formats for backward compatibility - Added `convertResponsesToVariableFormats` helper in `executeAIPhoneCall.ts` to convert form responses to both variable formats - Updated `customTemplate.ts` matching logic to support both variable formats - Updated `executeAIPhoneCall.ts` to include both variable formats when building dynamic variables This ensures existing templates using `{COMPANYNAME}` continue to work while new templates can use the documented `{COMPANY_NAME}` format. ## Mandatory Tasks (DO NOT REMOVE) - [x] I have self-reviewed the code (A decent size PR without self-review might be rejected). - [x] I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. N/A - no docs changes needed. - [x] I confirm automated tests are in place that prove my fix is effective or that my feature works. ## How should this be tested? 1. Create a routing form with a field identifier containing underscores (e.g., `Company_Name`) 2. Create a workflow with a template using `{COMPANY_NAME}` (with underscore) 3. Submit the form and verify the variable is replaced correctly 4. Also test with `{COMPANYNAME}` (without underscore) to verify backward compatibility **Automated tests added:** - `customTemplate.test.ts` - 15 tests covering `formatIdentifierToVariable`, `getVariableFormats`, and template variable replacement - `executeAIPhoneCall.test.ts` - 6 tests covering `convertResponsesToVariableFormats` function for form responses ## Human Review Checklist - [ ] Verify the regex change `[^a-zA-Z0-9_ ]` correctly preserves underscores - [ ] Verify backward compatibility: both `{COMPANY_NAME}` and `{COMPANYNAME}` should work for the same form field - [ ] Verify `convertResponsesToVariableFormats` correctly generates both variable formats - [ ] Review test coverage for edge cases (empty responses, undefined values) --- Link to Devin run: https://app.devin.ai/sessions/9d5d90178714493086d94691865c3e07 Requested by: @hariombalhara <!-- devin-review-badge-begin --> --- <a href="https://app.devin.ai/review/calcom/cal.com/pull/27571"> <picture> <source media="(prefers-color-scheme: dark)" srcset="https://static.devin.ai/assets/gh-open-in-devin-review-dark.svg?v=1"> <img src="https://static.devin.ai/assets/gh-open-in-devin-review-light.svg?v=1" alt="Open with Devin"> </picture> </a> <!-- devin-review-badge-end -->	2026-02-12 17:21:42 +05:30