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

Refactor:Vitest to OrgPeople Screen #2663

Merged

Conversation

shivasankaran18
Copy link

@shivasankaran18 shivasankaran18 commented Dec 14, 2024

What kind of change does this PR introduce?

Added Vitest to OrgPeople Screen

Issue Number: 2562

Fixes #2562

Did you add tests for your changes?
Yes

Snapshots/Videos:
Screenshot 2024-12-14 212038

If relevant, did you update the documentation?

Summary

Migrated the testing framework to Vitest.
Updated all test files and configurations to be compatible with Vitest's syntax and features.

Have you read the contributing guide?

Yes

Summary by CodeRabbit

  • Tests
    • Enhanced test coverage for the OrganizationPeople component with improved handling of navigation and URL assertions.
    • Updated mocking framework from jest to vitest.
    • Added type imports for better clarity and type safety.
    • Cleaned up code by removing commented-out sections and adding clarifying comments.
    • Improved handling of CSS modules in test configurations.
    • Updated assertions in the OrganizationScreen tests to use CSS module class names for better maintainability.

Copy link

coderabbitai bot commented Dec 14, 2024

Walkthrough

The pull request focuses on refactoring the OrganizationPeople.spec.tsx test file from Jest to Vitest. The changes involve updating the testing framework, modifying type imports, and enhancing the mocking of window.location to improve test assertions. The modifications maintain the existing test structure while adapting to Vitest's syntax and testing approach.

Changes

File Change Summary
src/screens/OrganizationPeople/OrganizationPeople.spec.tsx - Added type import for Params from react-router-dom
- Migrated from Jest to Vitest testing framework
- Updated window.location mocking implementation
- Refined location-based assertions
jest.config.js - Added CSS module mapping to identity-obj-proxy in moduleNameMapper
- Updated setupFiles to include whatwg-fetch

Assessment against linked issues

Objective Addressed Explanation
Replace Jest-specific functions with Vitest equivalents [#2562]
Ensure tests pass using npm run test:vitest [#2562] Requires full test suite verification.
Maintain 100% test coverage [#2562] Requires coverage report confirmation.

Possibly related issues

Possibly related PRs

Suggested labels

refactor, test

Suggested reviewers

  • palisadoes

Poem

🐰 In the realm of code, a test suite gleams,
Vitest replaces Jest's old dreams,
Location mocked with precision bright,
Assertions dancing in testing light,
A rabbit's refactor, clean and lean! 🧪


📜 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 6f0ec93 and f804edf.

📒 Files selected for processing (1)
  • src/components/OrganizationScreen/OrganizationScreen.test.tsx (1 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.
🔇 Additional comments (1)
src/components/OrganizationScreen/OrganizationScreen.test.tsx (1)

82-82: LGTM! Good use of CSS modules

The changes to use styles.expand and styles.contract instead of hardcoded class names improve test maintainability and make the tests more resilient to CSS module class name changes.

Also applies to: 88-88


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 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

@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

🧹 Outside diff range and nitpick comments (4)
src/screens/OrganizationPeople/OrganizationPeople.spec.tsx (4)

17-17: Remove commented-out import

The commented import jest-location-mock is no longer needed after migration to Vitest.

-// import 'jest-location-mock';

31-47: Add TypeScript types to window.location mock

The window.location mock implementation is comprehensive but could benefit from type safety.

 Object.defineProperty(window, 'location', {
   value: {
+    // Define the type for the mock implementation
+    type Location = {
+      href: string;
+      assign: (url: string) => void;
+      reload: () => void;
+      pathname: string;
+      search: string;
+      hash: string;
+      origin: string;
+    };
+
     href: 'http://localhost/',
-    assign: vi.fn((url) => {
+    assign: vi.fn((url: string) => {
       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',
-  },
+  } as Location,
 });

624-630: Consider using explicit module path in vi.mock

The React Router mock implementation is correct, but could be more explicit.

-vi.mock('react-router-dom', async () => {
+vi.mock('@/node_modules/react-router-dom', async () => {
   const actualDom = await vi.importActual('react-router-dom');
   return {
     ...actualDom,
     useParams: (): Readonly<Params<string>> => ({ orgId: linkURL }),
   };
 });

714-714: Enhance URL assertion messages

The URL assertions could be more descriptive to help with debugging test failures.

-expect(window.location.href).toBe('http://localhost/orgpeople/orgid');
+expect(window.location.href).toBe(
+  'http://localhost/orgpeople/orgid',
+  'URL should match the organization people page path'
+);

Also applies to: 736-736, 784-784, 823-823, 886-886, 936-936, 1287-1289, 1322-1324, 1413-1413

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between f4aafd7 and 04968fa.

📒 Files selected for processing (1)
  • src/screens/OrganizationPeople/OrganizationPeople.spec.tsx (12 hunks)
🧰 Additional context used
📓 Learnings (2)
📓 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.
src/screens/OrganizationPeople/OrganizationPeople.spec.tsx (1)
Learnt from: meetulr
PR: PalisadoesFoundation/talawa-admin#2425
File: src/screens/MemberDetail/MemberDetail.test.tsx:100-100
Timestamp: 2024-11-12T10:40:58.654Z
Learning: In `src/screens/MemberDetail/MemberDetail.test.tsx`, using `await wait();` is acceptable to wait for the render to complete.
🔇 Additional comments (2)
src/screens/OrganizationPeople/OrganizationPeople.spec.tsx (2)

Line range hint 48-622: Mock data setup looks good

The test data setup and mock configurations are well-structured and compatible with Vitest.


Line range hint 1-1415: Overall test migration looks good

The migration from Jest to Vitest has been implemented correctly. The test suite maintains good coverage and follows testing best practices. The changes are consistent with the PR objectives.

coderabbitai[bot]
coderabbitai bot previously approved these changes Dec 14, 2024
@shivasankaran18
Copy link
Author

shivasankaran18 commented Dec 14, 2024

@palisadoes the tests are only failing due to run jest tests on .test.tsx files (could not parse css stylesheet)...These are even failing after cloning the repo and running the command without making any code change

@palisadoes
Copy link
Contributor

Please fix the failing tests and ensure CodeRabbit.ai approves your changes

coderabbitai[bot]
coderabbitai bot previously approved these changes Dec 18, 2024
coderabbitai[bot]
coderabbitai bot previously approved these changes Dec 18, 2024
@shivasankaran18
Copy link
Author

shivasankaran18 commented Dec 18, 2024

@palisadoes ..fixed the failing tests

@shivasankaran18
Copy link
Author

@CodeRabbit review

Copy link

coderabbitai bot commented Dec 18, 2024

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@varshith257 varshith257 merged commit 8169150 into PalisadoesFoundation:develop-postgres Dec 19, 2024
7 of 8 checks passed
Copy link

codecov bot commented Dec 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.12%. Comparing base (4f05052) to head (d752471).
Report is 1 commits behind head on develop-postgres.

Additional details and impacted files
@@                 Coverage Diff                  @@
##           develop-postgres    #2663      +/-   ##
====================================================
- Coverage             90.64%   84.12%   -6.52%     
====================================================
  Files                   295      312      +17     
  Lines                  7046     8128    +1082     
  Branches               1521     1778     +257     
====================================================
+ Hits                   6387     6838     +451     
- Misses                  454     1135     +681     
+ Partials                205      155      -50     

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

This was referenced Dec 20, 2024
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.

3 participants