test: Integration tests for handleNewBooking #11044

hariombalhara · 2023-08-31T12:12:17Z

What does this PR do?

Note: There is some refactor in the stacked PR. I would be implementing any suggestions there to avoid non trivial conflicts

Adds integration tests for handleNewBooking. The tests are added in such a way that it would allow us to refactor the booking flow with lesser worries. I expect not much maintenance to be required for the tests as they mock the constructs that are going to stay there unless we do something drastic.

Partially completes #9284. Now the refactor can be done with a bit more confidence.

This was done to work on #7120 with more confidence.

Detailed Changes

Abstract out booking tests related code to bookingScenario so that it can be shared b/w getSchedule.test.ts and handleNewBooking.test.ts
Upgraded Vitest to be able to use fixture
Added vitest-fetch-mock to mock webhook fetch calls.

Following things are mocked

AppStore CalendarService - We just verify that the respective app's appropriate method has been called.
- Because it's mocked, Calendar Apps should test their logic themeselves.
AppStore VideoApiAdapter - We just verify that the respective app's appropriate method has been called.
- Because it's mocked, Calendar Apps should test their logic themeselves.
fetch to verify webhooks
Prisma queries

Run the tests as follows

Watch mode: yarn tdd handleNewBooking
One time: yarn test handleNewBooking

More improvements in the stacked PR #11099

vercel · 2023-08-31T12:12:25Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
ai	❌ Failed (Inspect)			Sep 6, 2023 7:16pm
api	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Sep 6, 2023 7:16pm
cal-demo	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Sep 6, 2023 7:16pm
dev	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Sep 6, 2023 7:16pm
ui	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Sep 6, 2023 7:16pm

2 Ignored Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Sep 6, 2023 7:16pm
qa	⬜️ Ignored (Inspect)	Visit Preview		Sep 6, 2023 7:16pm

github-actions · 2023-08-31T12:12:31Z

Thank you for following the naming conventions! 🙏

vitest.config.ts

github-actions · 2023-08-31T12:21:32Z

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

deploysentinel · 2023-08-31T12:22:38Z

Current Playwright Test Results Summary

✅ 117 Passing - ⚠️ 5 Flaky

Run may still be in progress, this comment will be updated as current testing workflow or job completes...

(Last updated on 09/06/2023 07:17:33pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: 983ab2c

Started: 09/06/2023 07:14:14pm UTC

⚠️ Flakes

📄 apps/web/playwright/login.2fa.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
2FA Tests should allow a user to enable 2FA and login using 2FA Retry 1 • Initial Attempt	0.67% (2) 2 / 298 runs failed over last 7 days	27.85% (83) 83 / 298 runs flaked over last 7 days

📄 apps/web/playwright/integrations-stripe.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Stripe integration Pending payment booking should not be confirmed by default Retry 1 • Initial Attempt	1.63% (5) 5 / 307 runs failed over last 7 days	4.89% (15) 15 / 307 runs flaked over last 7 days

📄 apps/web/playwright/event-types.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Event Types tests user Different Locations Tests can add Attendee Phone Number location and book with it Retry 1 • Initial Attempt	1.98% (6) 6 / 303 runs failed over last 7 days	10.89% (33) 33 / 303 runs flaked over last 7 days

📄 apps/web/playwright/managed-event-types.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Managed Event Types tests Can create managed event type Retry 1 • Initial Attempt	3.18% (10) 10 / 314 runs failed over last 7 days	11.46% (36) 36 / 314 runs flaked over last 7 days

📄 packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Popup Tests should be able to reschedule Retry 1 • Initial Attempt	1.93% (6) 6 / 311 runs failed over last 7 days	96.78% (301) 301 / 311 runs flaked over last 7 days

View Detailed Build Results

.prettierignore

apps/web/.prettierignore

apps/web/next.config.js

shivamklr

Added a few changes, let me know your thoughts on the same.

turbo.json

vitest.config.ts

packages/features/bookings/lib/handleNewBooking.test.ts

shivamklr · 2023-09-06T09:17:00Z

apps/web/test/utils/bookingScenario.ts

+    };
+  });
+
+  logger.silly("TestData: Creating EventType", eventTypes);


Not sure how these logs are helpful with the current logger implementation, https://github.com/calcom/cal.com/blob/2f90dc7cb6470fea486d19dce5de9714a0b9c079/packages/lib/logger.ts#L6C1-L6C64

I must be missing a .env variable, let me know if that is the case.

Yeah right now you need to set the log level manually in code like this
logger.setSettings({ minLevel: "silly" }). Don't want to hardcode this, maybe I can pass some argument to vitest and then based on that I can enable this log level, so that it doesn't spam by default.

We can maybe use an .env variable to set the logger level and keep the default to warn and error level.

shivamklr · 2023-09-06T10:52:15Z

packages/lib/testEmails.ts

We should keep the types in the separate declaration file.

packages/features/bookings/lib/handleNewBooking.test.ts

shivamklr · 2023-09-06T11:12:36Z

apps/web/test/lib/getSchedule.test.ts

yarn test getSchedule is failing locally. Kindly let me know if I setup something wrong.

I think getSchedule is known to fail depending on timezones. For now, if it's passing on CI, we should be fine.

@emrysal What do you think?

apps/web/test/utils/bookingScenario.ts

…/handleNewBooking

hariombalhara · 2023-09-06T11:47:21Z

Thanks @shivamklr for the detailed review 🙏 Addressed all your feedback here in the stacked PR

Addressed

zomars · 2023-09-06T19:11:17Z

packages/features/bookings/lib/handleNewBooking.test.ts

@@ -0,0 +1,511 @@
+/**
+ * How to ensure that unmocked prisma queries aren't called?


Maybe ensure calling an actual but disposable database? https://github.com/sabinadams/express_sample_app/blob/integration-tests/scripts/run-integration.sh

For now I have ensured that through fallbackMockImplementation

zomars

Awesome work @hariombalhara

Looks ready to merge

Co-authored-by: Shivam Kalra <[email protected]> Co-authored-by: Joe Au-Yeung <[email protected]>

* Pass organization name & logo * Overflow hidden * Show org icon on public page * Add org logo to large user avatars * Clean up * Add org name and logo to context * Get org logo from /avatar.png endpoint * Do not query for logo * Remove name and logo from session middleware * Type fix * Set user onboarding org logo * feat: organization avatar component (#10788) Co-authored-by: sean-brydon <[email protected]> * Type fixes * Type fix * Transition to org slug for organization avatar * Address feedback * Clean up * Clean up * Type fix * fix: set avatar cache control (#11163) * test: Integration tests for handleNewBooking (#11044) Co-authored-by: Shivam Kalra <[email protected]> Co-authored-by: Joe Au-Yeung <[email protected]> * fix: booking_paid webhook and added new payment metadata (#11093) * app store improvements, logos, dark mode, added screenshots, fixed author names (#11164) * fix: mobile event types and avatars (#11184) * New Crowdin translations by Github Action * fix: updateProfile metadata overwrite (#11188) Co-authored-by: alannnc <[email protected]> * New Crowdin translations by Github Action --------- Co-authored-by: Sean Brydon <[email protected]> Co-authored-by: sean-brydon <[email protected]> Co-authored-by: Omar López <[email protected]> Co-authored-by: Hariom Balhara <[email protected]> Co-authored-by: Shivam Kalra <[email protected]> Co-authored-by: alannnc <[email protected]> Co-authored-by: Peer Richelsen <[email protected]> Co-authored-by: Leo Giovanetti <[email protected]> Co-authored-by: Crowdin Bot <[email protected]>

* Pass organization name & logo * Overflow hidden * Show org icon on public page * Add org logo to large user avatars * Clean up * Add org name and logo to context * Get org logo from /avatar.png endpoint * Do not query for logo * Remove name and logo from session middleware * Type fix * Set user onboarding org logo * feat: organization avatar component (calcom#10788) Co-authored-by: sean-brydon <[email protected]> * Type fixes * Type fix * Transition to org slug for organization avatar * Address feedback * Clean up * Clean up * Type fix * fix: set avatar cache control (calcom#11163) * test: Integration tests for handleNewBooking (calcom#11044) Co-authored-by: Shivam Kalra <[email protected]> Co-authored-by: Joe Au-Yeung <[email protected]> * fix: booking_paid webhook and added new payment metadata (calcom#11093) * app store improvements, logos, dark mode, added screenshots, fixed author names (calcom#11164) * fix: mobile event types and avatars (calcom#11184) * New Crowdin translations by Github Action * fix: updateProfile metadata overwrite (calcom#11188) Co-authored-by: alannnc <[email protected]> * New Crowdin translations by Github Action --------- Co-authored-by: Sean Brydon <[email protected]> Co-authored-by: sean-brydon <[email protected]> Co-authored-by: Omar López <[email protected]> Co-authored-by: Hariom Balhara <[email protected]> Co-authored-by: Shivam Kalra <[email protected]> Co-authored-by: alannnc <[email protected]> Co-authored-by: Peer Richelsen <[email protected]> Co-authored-by: Leo Giovanetti <[email protected]> Co-authored-by: Crowdin Bot <[email protected]>

hariombalhara added 2 commits August 29, 2023 20:59

Add tests

2d91e8c

Fix issues

e4f0857

zomars added the core area: core, team members only label Aug 31, 2023

hariombalhara commented Aug 31, 2023

View reviewed changes

vitest.config.ts Show resolved Hide resolved

vercel bot had a problem deploying to Preview – ui August 31, 2023 12:19 Failure

vercel bot deployed to Preview – api August 31, 2023 12:23 View deployment

vercel bot deployed to Preview – cal-demo August 31, 2023 12:27 View deployment

vercel bot deployed to Preview – dev August 31, 2023 12:28 View deployment

hariombalhara added 3 commits September 1, 2023 14:09

Merge remote-tracking branch 'origin/main' into test/handleNewBooking

773c692

Merge remote-tracking branch 'origin/main' into test/handleNewBooking

08a1346

Fixes

7ff97a6

hariombalhara force-pushed the test/handleNewBooking branch from a8019d2 to 7ff97a6 Compare September 1, 2023 15:36

vercel bot had a problem deploying to Preview – ai September 1, 2023 15:39 Failure

vercel bot deployed to Preview – ui September 1, 2023 15:40 View deployment

vercel bot deployed to Preview – api September 1, 2023 15:42 View deployment

vercel bot deployed to Preview – dev September 1, 2023 15:43 View deployment

vercel bot deployed to Preview – cal-demo September 1, 2023 15:46 View deployment

hariombalhara added 2 commits September 2, 2023 14:16

More Fixes

21bb589

Remove the changes, just keep the tests

1f968cd

hariombalhara commented Sep 2, 2023

View reviewed changes

.prettierignore Outdated Show resolved Hide resolved

Update .prettierignore

0f72782

hariombalhara commented Sep 2, 2023

View reviewed changes

apps/web/.prettierignore Outdated Show resolved Hide resolved

Update apps/web/.prettierignore

1e8e697

hariombalhara commented Sep 2, 2023

View reviewed changes

apps/web/next.config.js Outdated Show resolved Hide resolved

Update apps/web/next.config.js

aaf8328

vercel bot had a problem deploying to Preview – ai September 2, 2023 08:54 Failure

Merge branch 'main' into test/handleNewBooking

a782dc5

vercel bot had a problem deploying to Preview – ai September 6, 2023 11:09 Failure

vercel bot deployed to Preview – ui September 6, 2023 11:11 View deployment

vercel bot deployed to Preview – api September 6, 2023 11:11 View deployment

vercel bot deployed to Preview – dev September 6, 2023 11:12 View deployment

vercel bot deployed to Preview – cal-demo September 6, 2023 11:13 View deployment

shivamklr previously requested changes Sep 6, 2023

View reviewed changes

hariombalhara requested a review from shivamklr September 6, 2023 11:44

hariombalhara added 2 commits September 6, 2023 17:16

Reuse existing INTEGRATION_TEST_MODE env variable

2bbdc49

Merge remote-tracking branch 'origin/test/handleNewBooking' into test…

9afd10e

…/handleNewBooking

vercel bot had a problem deploying to Preview – ai September 6, 2023 11:49 Failure

vercel bot deployed to Preview – ui September 6, 2023 11:50 View deployment

vercel bot deployed to Preview – api September 6, 2023 11:51 View deployment

vercel bot deployed to Preview – dev September 6, 2023 11:52 View deployment

vercel bot deployed to Preview – cal-demo September 6, 2023 11:52 View deployment

Merge branch 'main' into test/handleNewBooking

983ab2c

vercel bot had a problem deploying to Preview – ai September 6, 2023 19:09 Failure

vercel bot deployed to Preview – ui September 6, 2023 19:10 View deployment

zomars reviewed Sep 6, 2023

View reviewed changes

vercel bot deployed to Preview – api September 6, 2023 19:12 View deployment

vercel bot deployed to Preview – dev September 6, 2023 19:13 View deployment

vercel bot deployed to Preview – cal-demo September 6, 2023 19:16 View deployment

zomars approved these changes Sep 6, 2023

View reviewed changes

zomars merged commit f9eb335 into main Sep 6, 2023

zomars deleted the test/handleNewBooking branch September 6, 2023 19:23

sean-brydon pushed a commit that referenced this pull request Sep 7, 2023

test: Integration tests for handleNewBooking (#11044)

e05aa12

Co-authored-by: Shivam Kalra <[email protected]> Co-authored-by: Joe Au-Yeung <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test: Integration tests for handleNewBooking #11044

test: Integration tests for handleNewBooking #11044

hariombalhara commented Aug 31, 2023 •

edited

Loading

vercel bot commented Aug 31, 2023 •

edited

Loading

github-actions bot commented Aug 31, 2023 •

edited

Loading

github-actions bot commented Aug 31, 2023 •

edited

Loading

deploysentinel bot commented Aug 31, 2023 •

edited

Loading

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

shivamklr left a comment

shivamklr Sep 6, 2023

hariombalhara Sep 6, 2023

shivamklr Sep 6, 2023

shivamklr Sep 6, 2023

shivamklr Sep 6, 2023

hariombalhara Sep 6, 2023

shivamklr Sep 6, 2023

hariombalhara commented Sep 6, 2023 •

edited

Loading

zomars Sep 6, 2023

hariombalhara Sep 7, 2023

zomars left a comment

		@@ -0,0 +1,511 @@
		/**
		* How to ensure that unmocked prisma queries aren't called?

test: Integration tests for handleNewBooking #11044

test: Integration tests for handleNewBooking #11044

Conversation

hariombalhara commented Aug 31, 2023 • edited Loading

What does this PR do?

Detailed Changes

Run the tests as follows

vercel bot commented Aug 31, 2023 • edited Loading

github-actions bot commented Aug 31, 2023 • edited Loading

github-actions bot commented Aug 31, 2023 • edited Loading

📦 Next.js Bundle Analysis for @calcom/web

deploysentinel bot commented Aug 31, 2023 • edited Loading

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

Test Case Results

Test Case Results

Test Case Results

Test Case Results

shivamklr left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hariombalhara commented Sep 6, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zomars left a comment

Choose a reason for hiding this comment

hariombalhara commented Aug 31, 2023 •

edited

Loading

vercel bot commented Aug 31, 2023 •

edited

Loading

github-actions bot commented Aug 31, 2023 •

edited

Loading

github-actions bot commented Aug 31, 2023 •

edited

Loading

deploysentinel bot commented Aug 31, 2023 •

edited

Loading

hariombalhara commented Sep 6, 2023 •

edited

Loading