[pull] main from calcom:main#1165
Merged
pull[bot] merged 3 commits intoUncodedtech:mainfrom Mar 8, 2026
Merged
Conversation
#28329) The locale E2E tests (de->ar and de->pt-BR) were flaky because they used a brittle CSS selector (.bg-default > div > div:nth-child(2)) to click the language dropdown. This selector was susceptible to react-select's internal Input wrapper element intercepting pointer events. Changes: - Add data-testid='locale-select' to the language Select in general settings - Replace CSS path selectors with getByTestId('locale-select') in tests - Replace text selector for pt-BR with getByTestId('select-option-pt-BR') Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
…eout (#28320) * perf: batch DB operations in performance test setup to avoid CI timeout Replace ~5200 sequential DB inserts with batch createMany() operations in createHugeAttributesOfTypeSingleSelect. The test was timing out at 60s on 2-vCPU CI runners because the setup phase alone (creating 400 users, 800 memberships, 4000 attribute assignments one-by-one) exceeded the timeout before the actual logic under test even ran. Co-Authored-By: romitgabani1 <romitgabani1.work@gmail.com> * perf: optimize createAttributesScenario with batch DB operations Move batch DB operations (createMany) into the shared createAttributesScenario helper so all tests benefit, not just the performance test. Simplify createHugeAttributesOfTypeSingleSelect to delegate to the optimized helper. Co-Authored-By: romitgabani1 <romitgabani1.work@gmail.com> * Revert "perf: optimize createAttributesScenario with batch DB operations" This reverts commit c739edd. * Revert "perf: batch DB operations in performance test setup to avoid CI timeout" This reverts commit ff6642a. * perf: optimize createAttributesScenario with batch DB operations Replace sequential prisma.*.create() calls in the shared createAttributesScenario helper with batch createMany() calls, reducing ~5,200 sequential DB operations to ~10 batch operations. Simplify createHugeAttributesOfTypeSingleSelect to delegate to the optimized helper instead of duplicating batch logic. Co-Authored-By: romitgabani1 <romitgabani1.work@gmail.com> * fix: preserve deterministic user ordering in createAttributesScenario Map users by email after findMany to ensure the index-based attribute assignment matches the original userDataList order, since findMany does not guarantee return order. Co-Authored-By: romitgabani1 <romitgabani1.work@gmail.com> * revert: make test timeout back to 1 min * refactor: extract batch helpers createTestUsers, createTestMembershipsForUsers, createTestAttributeAssignments Organize batch DB operations from createAttributesScenario into reusable helper functions mirroring the existing single-record helpers. Co-Authored-By: romitgabani1 <romitgabani1.work@gmail.com> * cleanup: remove unused single-record helpers and JSDoc comments Remove createTestUser, createTestMemberships, createTestAttributeAssignment (now replaced by batch versions). Remove added comments. Co-Authored-By: romitgabani1 <romitgabani1.work@gmail.com> * chore --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
* fix: resolve duplicate new-team-btn selector in teams E2E test Remove TeamsCTA from the loading skeleton to prevent duplicate data-testid='new-team-btn' elements in the DOM during Next.js streaming SSR. The skeleton's Suspense fallback and the resolved page content can briefly coexist, causing Playwright's strict mode to fail when both contain the same test ID. Also use .first() in the E2E test as a defensive measure. Co-Authored-By: romitgabani1 <romitgabani1.work@gmail.com> * fix: assert single new-team-btn element instead of using .first() Address Cubic AI review feedback: use toHaveCount(1) assertion to ensure exactly one new-team-btn exists, rather than .first() which could mask duplicate-element regressions. Co-Authored-By: romitgabani1 <romitgabani1.work@gmail.com> * fix: revert test changes, only remove CTA from skeleton Per user feedback: only change needed is removing TeamsCTA from the loading skeleton to prevent users without a team plan from bypassing the upgrade banner via the skeleton CTA. Co-Authored-By: romitgabani1 <romitgabani1.work@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )