Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactored src/screens/OrganizationEvents.tsx from Jest to Vitest #2559 #3013

Merged

Conversation

Ramneet04
Copy link
Contributor

@Ramneet04 Ramneet04 commented Dec 28, 2024

Refactored src/screens/OrganizationEvents/OrganizationEvents.test.tsx to
src/screens/OrganizationEvents/OrganizationEvents.spec.tsx

Issue: #2559: #2559

Changes Implemented:

Refactored the testing framework from Jest to Vitest in src/screens/OrganizationEvents/OrganizationEvents.test.tsx.
Updated import statements, mocking methods, and assertions to align with Vitest conventions.
Verified compatibility with the existing codebase using Vitest.

issue8 1

Other information
I have read the previous refactor PR and tried to keep things as uniform as possible.
Please suggest any other changes if required.

Summary by CodeRabbit

  • Chores
    • Migrated test suite from Jest to Vitest testing framework.
    • Updated mocking and assertion methods to align with Vitest.
    • Refined window.location and global alert function mocking techniques.

Copy link
Contributor

coderabbitai bot commented Dec 28, 2024

Walkthrough

The pull request focuses on migrating the test file OrganizationEvents.spec.tsx from Jest to Vitest. The changes involve replacing Jest-specific testing functions and mocking methods with their Vitest equivalents. This includes updating mock function declarations, import statements, and assertion methods to align with Vitest's syntax while maintaining the original test logic and coverage.

Changes

File Change Summary
src/screens/OrganizationEvents/OrganizationEvents.spec.tsx - Replaced jest.mock with vi.mock
- Replaced jest.requireActual with vi.importActual
- Updated window.location mock using Object.defineProperty
- Changed jest.fn() to vi.fn()
- Modified location assertion from expect(window.location).toBeAt('/orglist'); to expect(window.location.pathname).toBe('/orglist');

Possibly related issues

Possibly related PRs

Suggested reviewers

  • palisadoes

Poem

🐰 Hopping through code with glee,
Jest to Vitest, testing spree!
Mocks and functions realigned,
Test coverage carefully designed.
Rabbit's testing dance is bright! 🧪


📜 Recent review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between b5e9021 and 0d647c1.

📒 Files selected for processing (1)
  • src/screens/OrganizationEvents/OrganizationEvents.spec.tsx (4 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • src/screens/OrganizationEvents/OrganizationEvents.spec.tsx

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

Our Pull Request Approval Process

Thanks for contributing!

Testing Your Code

Remember, your PRs won't be reviewed until these criteria are met:

  1. We don't merge PRs with poor code quality.
    1. Follow coding best practices such that CodeRabbit.ai approves your PR.
  2. We don't merge PRs with failed tests.
    1. When tests fail, click on the Details link to learn more.
    2. Write sufficient tests for your changes (CodeCov Patch Test). Your testing level must be better than the target threshold of the repository
    3. Tests may fail if you edit sensitive files. Ask to add the ignore-sensitive-files-pr label if the edits are necessary.
  3. We cannot merge PRs with conflicting files. These must be fixed.

Our policies make our code better.

Reviewers

Do not assign reviewers. Our Queue Monitors will review your PR and assign them.
When your PR has been assigned reviewers contact them to get your code reviewed and approved via:

  1. comments in this PR or
  2. our slack channel

Reviewing Your Code

Your reviewer(s) will have the following roles:

  1. arbitrators of future discussions with other contributors about the validity of your changes
  2. point of contact for evaluating the validity of your work
  3. person who verifies matching issues by others that should be closed.
  4. person who gives general guidance in fixing your tests

CONTRIBUTING.md

Read our CONTRIBUTING.md file. Most importantly:

  1. PRs with issues not assigned to you will be closed by the reviewer
  2. Fix the first comment in the PR so that each issue listed automatically closes

Other

  1. 🎯 Please be considerate of our volunteers' time. Contacting the person who assigned the reviewers is not advised unless they ask for your input. Do not @ the person who did the assignment otherwise.
  2. Read the CONTRIBUTING.md file make

Copy link
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.

Actionable comments posted: 1

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 81c66d9 and 94c6ab1.

📒 Files selected for processing (1)
  • src/screens/OrganizationEvents/OrganizationEvents.spec.tsx (5 hunks)
🧰 Additional context used
📓 Learnings (1)
📓 Common learnings
Learnt from: bitbard3
PR: PalisadoesFoundation/talawa-admin#2588
File: src/components/ChangeLanguageDropdown/ChangeLanguageDropdown.spec.tsx:145-155
Timestamp: 2024-12-02T04:20:11.745Z
Learning: In PRs focused solely on refactoring test cases from Jest to Vitest, avoid suggesting optimizations or changes outside the migration scope.
🪛 GitHub Check: Performs linting, formatting, type-checking, checking for different source and target branch
src/screens/OrganizationEvents/OrganizationEvents.spec.tsx

[failure] 76-76:
Property 'DesktopDateTimePicker' does not exist on type 'Promise'.

🔇 Additional comments (5)
src/screens/OrganizationEvents/OrganizationEvents.spec.tsx (5)

25-25: Nice transition from Jest to Vitest imports.
Looks consistent with the rest of the file.


34-50: Good approach to mocking window.location.
This approach provides clear control over location properties in a test environment.


80-84: Mocking react-toastify with Vitest looks correct.
Mock definitions are straightforward and aligned with Vitest’s patterns.


99-99: Swapping global.alert to vi.fn() is correct.
This retains the original testing behavior while adhering to Vitest’s mocking.


167-167: Path-based assertion aligns with the location mock.
Confirming the pathname directly is a reliable approach to ensure correct navigation.

src/screens/OrganizationEvents/OrganizationEvents.spec.tsx Outdated Show resolved Hide resolved
@palisadoes
Copy link
Contributor

  1. Merge your local branch with the latest upstream
  2. Commit and push to your origin
  3. It should fix some of the PR check failures
  4. We merged some recent updates that may have been after you initially submitted your PR

coderabbitai[bot]
coderabbitai bot previously approved these changes Dec 29, 2024
@palisadoes
Copy link
Contributor

Please merge your local branch with the latest upstream, commit and then push to your origin.

@palisadoes
Copy link
Contributor

Please fix the failing test

Copy link
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.

Actionable comments posted: 0

🧹 Nitpick comments (1)
src/screens/OrganizationEvents/OrganizationEvents.spec.tsx (1)

33-49: Consider using Vitest's built-in window mock

The current window.location mock implementation could be simplified using Vitest's built-in functionality:

-Object.defineProperty(window, 'location', {
-  value: {
-    href: 'http://localhost/',
-    assign: vi.fn((url) => {
-      const urlObj = new URL(url, 'http://localhost');
-      window.location.href = urlObj.href;
-      window.location.pathname = urlObj.pathname;
-      window.location.search = urlObj.search;
-      window.location.hash = urlObj.hash;
-    }),
-    reload: vi.fn(),
-    pathname: '/',
-    search: '',
-    hash: '',
-    origin: 'http://localhost',
-  },
-});
+vi.stubGlobal('location', {
+  href: 'http://localhost/',
+  assign: vi.fn(),
+  reload: vi.fn(),
+  pathname: '/',
+  search: '',
+  hash: '',
+  origin: 'http://localhost',
+});
📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 767727a and b5e9021.

📒 Files selected for processing (1)
  • src/screens/OrganizationEvents/OrganizationEvents.spec.tsx (4 hunks)
🧰 Additional context used
📓 Learnings (1)
📓 Common learnings
Learnt from: bitbard3
PR: PalisadoesFoundation/talawa-admin#2588
File: src/components/ChangeLanguageDropdown/ChangeLanguageDropdown.spec.tsx:145-155
Timestamp: 2024-12-02T04:20:11.745Z
Learning: In PRs focused solely on refactoring test cases from Jest to Vitest, avoid suggesting optimizations or changes outside the migration scope.
🪛 GitHub Check: Performs linting, formatting, type-checking, checking for different source and target branch
src/screens/OrganizationEvents/OrganizationEvents.spec.tsx

[failure] 73-73:
Property 'requireActual' does not exist on type 'VitestUtils'.

🔇 Additional comments (3)
src/screens/OrganizationEvents/OrganizationEvents.spec.tsx (3)

79-84: LGTM: Toast mock implementation

The toast mock is correctly implemented using Vitest's mocking functionality.


98-98: LGTM: Alert mock and location assertions

The changes correctly implement Vitest's mocking and assertion patterns:

  • Global alert mock using vi.fn()
  • Window location assertion using explicit pathname check

Also applies to: 166-166


71-75: ⚠️ Potential issue

Fix DateTimePicker mock implementation

The current mock implementation has two issues:

  1. DesktopDateTimePicker might not exist on the imported module
  2. Type error with vi.requireActual

Apply this fix:

 vi.mock('@mui/x-date-pickers/DateTimePicker', () => {
   return {
-    DateTimePicker: vi.requireActual(
-      '@mui/x-date-pickers/DesktopDateTimePicker',
-    ).DesktopDateTimePicker,
+    DateTimePicker: vi.importActual('@mui/x-date-pickers/DateTimePicker')
+      .then((actual) => actual.DateTimePicker),
   };
 });

Likely invalid or redundant comment.

🧰 Tools
🪛 GitHub Check: Performs linting, formatting, type-checking, checking for different source and target branch

[failure] 73-73:
Property 'requireActual' does not exist on type 'VitestUtils'.

coderabbitai[bot]
coderabbitai bot previously approved these changes Dec 29, 2024
@Ramneet04
Copy link
Contributor Author

hey @palisadoes could you please help me out a bit how to address this issue, can u refer me some resources for this.

@palisadoes
Copy link
Contributor

Please click on the error link. It's explained there

@Ramneet04
Copy link
Contributor Author

Please click on the error link. It's explained there

yeah I finally found a way to do it.

Copy link

codecov bot commented Dec 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.94%. Comparing base (78699b3) to head (0d647c1).
Report is 1 commits behind head on develop-postgres.

Additional details and impacted files
@@                  Coverage Diff                  @@
##           develop-postgres    #3013       +/-   ##
=====================================================
+ Coverage             29.13%   88.94%   +59.80%     
=====================================================
  Files                   300      321       +21     
  Lines                  7568     8409      +841     
  Branches               1652     1836      +184     
=====================================================
+ Hits                   2205     7479     +5274     
+ Misses                 5177      688     -4489     
- Partials                186      242       +56     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@palisadoes palisadoes merged commit 1bc3c5e into PalisadoesFoundation:develop-postgres Dec 29, 2024
15 checks passed
Dhiren-Mhatre pushed a commit to Dhiren-Mhatre/talawa-admin that referenced this pull request Dec 30, 2024
…isadoesFoundation#2559 (PalisadoesFoundation#3013)

* file name changed

* mocking window object

* migration success

* fixing datetimepicker error

* datepicker error fixed

* fixed the datepickerError
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants