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 Advertisements test from Jest to Vitest #2486 #2686

Conversation

khushipatil1523
Copy link
Contributor

@khushipatil1523 khushipatil1523 commented Dec 19, 2024

What kind of change does this PR introduce?

refactoring

Issue Number: #2484

Fixes ##2484

Did you add tests for your changes?

Vitest tes passed 👍

Screenshot 2024-12-19 221742

Summary by CodeRabbit

  • New Features

    • Introduced a new configuration for the Vitest testing framework to enhance testing capabilities.
    • Added exclusion settings in TypeScript configuration to streamline the compilation process.
  • Bug Fixes

    • Updated assertions in multiple test cases to improve clarity and consistency in toast notification checks.
  • Documentation

    • Enhanced metadata in the project configuration for better documentation and structure.
  • Chores

    • Updated various dependencies to their latest versions for improved performance and security.
    • Modified pre-commit hooks to streamline the development workflow.

DangaRanga and others added 30 commits May 23, 2021 12:21
Updated CONTRIBUTING.md with new branching strategy
…dependabot/npm_and_yarn/dns-packet-1.3.4

Bump dns-packet from 1.3.1 to 1.3.4
* Update authorized-changes-detection.yml

* Code Coverage @ 87.1%

* Update .gitignore

* Delete codecov

This executable should not be in the repo

* added translation hint text in placeholders (#487)

* Update pull-requests.yml

* Create DOCUMENTATION.md

* Rename issue-guidelines.md to ISSUE_GUIDELINES.md

* Update CONTRIBUTING.md

* Update issue.yml

* Rename PR-guidelines.md to PR_GUIDELINES.md

* Update CONTRIBUTING.md

* Update pull-request-target.yml

* Delete PULL_REQUEST_TEMPLATE.md

* Delete ISSUE_TEMPLATE.md

* Rename Code_Style.md to CODE_STYLE.md

* added removeMember mutation (#491)

* added removeMember mutation

* changed mutation name

* remove contributions from router (#502)

* Fixed Settings page Header (#501)

* fixed cani-use lite warning

* fixed the alignments for smaller screens and also added spacing on places where it was needed

* fixed the linting errors

* ran prettier to remove styling errors

* made the orgSetting title dynamic

* linted the code and made the settings header as required and also made the settings page navbar responsive

* linted code and made necessary changes

* errors fixed

* Added dropdown for Applanguage in UserUpdation form (#498)

* Added dropdown for Applanguage in UserUpdation form

* App language code changed to Default language

* Change the Scalar Types [Provides relevant client side changes for #1085 in Talawa-API] (#500)

* Change typedefs

* Fix date parsing

* Move ID to ObjectID scalar

* Client changes for Adding GraphQL Scalars (#511)

* Change typedefs

* Fix date parsing

* Move ID to ObjectID scalar

* Revert ObjectID to ID

* Change ObjectID to ID

* modal closed after organization creation (#516)

* most recently added Org displays at the top (#515)

* Add Husky (#520)

* updated contributing (#521)

* Display and choose Organisation image (#512)

* upload image working for createOrganisation

* Organisation image showing everywhere

* Testcase failure fixed

* Linting fixed

* convertToBase64 func made and tests for it

* CI/CD error fixed

* tests added for AdminNavbar & OrganisationDashboard

* Linting fixed

* fixed translation on the plugin tab (#510)

* added OrgName to the Navbar (#525)

* Fix create event mutation [Fixes part of #1101 in Talawa-API] (#523)

* Add format fix

* Fix updation of posts

* Test coverage improved for organizationPeople.tsx (#526)

* Update INSTALLATION.md

* Update INSTALLATION.md

* Update INSTALLATION.md

* Update stale.yml

* Remove tags (#532)

* Fixed navbar added tests (#534)

* Fixed navbar added tests

* Fixed the translation of All orgnaizations btn in AdminNavbar

* Fix the updateOrg page, and made it to create mutation request [Fixes #531] (#536)

* fix orgUpdate system

* fix translations

* Update CONTRIBUTING.md

* Code Coverage @ 88%

* Fixes #478 : Implemeneted calendar to the Event tab (#537)

* calendar-implemented

* calendar-implemented

* fixed tests

* Added post-merge hook using husky (#541)

* Added post-merge hook using husky

* made required changes to installation.md

* make changes to documentation for husky

* made the required changes in installation guide

* Update pull-requests.yml

* Fixed yarn installation instructions (#584)

* organization sorting for all organization (#619)

* removed redundant notification (#577)

* Profile Page for Members (#543)

* Initial member page made

* Changed query added Org and Events section

* Homescreen ready

* initial translation added for Profile

* initial translation added for Profile

* Added translations

* Added translations

* Revised translation

* Fixed failing tests for components

* Link added to OrgAdminListCard

* Linting fixed for OrgPeopleListCard

* Added tests, removed logs

* Uniform design

* Fix:routing issue for orgdash page (#580)

* Fix:routing issue for orgdash page

* fix:failing test of SuperDashListCard

* Rectify Warnings: EventListCard.test.tsx (#595)

* Added logic to close modal after successful submission (#623)

* Feature Request: Position of the search bar.  (#631)

* Feature Request: Position of the search bar #614 resolved

* Feature Request: Position of the search bar #614 resolved

* fixes: #550 added test for the calendar (#552)

* added test for the calendar

* updates mocks

* Update Router Function [Fixes #636] (#638)

* Update Router Function

* Empty commit

* Fix about content overflow (#632)

Signed-off-by: Ekene Nwobodo <[email protected]>

* removed duplicate rows per page section in orgposts (#648)

* fixed :made card in organization dashboard interactive (#620)

* Implemented manage functionality for admin and super admin after login (#539)

* Implememnted manage functinality for admin/superadmin after login

* Update AdminDashListCard.module.css

* Some formatting issues with module file

* resolved workflow issues

* Added folding feature to posts (#581)

* added folding feature to posts

* added fold feature to posts

* brought code under code coverage

* added tests

* added tests for remainging uncovered lines

* brought code coverage to 100% for the changes

* Code coverage @87.2%

* Fix User Update Details Page and Add Update Password Page [Fixes #530] (#657)

* fixed updateuser logic

* update translations

* fix lint

* lint fix 2

* fix tests

* fixed:move orgLocation & remove duplicate orgName (#655)

* fixed:move orgLocation & remove duplicate orgName

* Dummy commit

* fixes - [#597] - Navbar navlinks hover and button styles  (#603)

* fixed: #585 - Password error showing. Tested

* fix: #590 - fixed navbar hover issues

* fix: #590 - fixed navbar hover issues

* Code Coverage 87.4%

* fixes 599 (#653)

* fixed errors and removed window.replace

* written test case for ensure window.location.replace

* written test case for ensure window.location.replace

* added useHistory to keep track of routing behind the scenes

* fixed merge conflicts and errors

* updated comments for file changes

* Added warning comments for routing

---------

Co-authored-by: Adepeju <adepeju.kayode@gmail>

* fix org search location (#682)

Signed-off-by: Ekene Nwobodo <[email protected]>

* fixed the issue of validate the input before submit #674 (#678)

* Adds required tests for OrganizationEvents.tsx and Fixes a minor bug in Calendar (#527)

* adds tests for organization events

* removes the unrequired branch from OrganizationEvents.tsx

* fixes failing tests

* fixes failing lint tests

* Update password preview feature with coverage tests (#629)

* Fix to the issue #585 (#607)

* [fix]- fixed the password error warning

* [fix]- fixed the password error warning

* [fix]- fixed the password error warning

* [fix]-fixed the password error warning

* [fix]-fixed the password error warning

* [fix]-fixed the password error warning

* [fix]-fixed the password error warning

* [feat]-added test cases for password error warning

* [feat]- added test cases for password error warning

* [feat]- added test cases for password error warning

* [fix]- fixed the linting

* Improve test coverage for calendar.tsx (#679)

* Improve test coverage for calendar.tsx

* Restore previous tests

* remove --coverage

* i rebased my codebase and resolved the initial issue (#669)

* fixed the issue use of toast in place of window.alert #645 (#687)

* Update ISSUE_GUIDELINES.md

* fixed the static time data under Organization card in the Organization List tab (#689)

* fixed the static time in org card

* formatted the date to MM D, YYYY

---------

Co-authored-by: thesaaddevloper <[email protected]>

* Fixed the pagination alignment issue (#702)

* [fix]- fixed the password error warning

* [fix]- fixed the password error warning

* [fix]- fixed the password error warning

* [fix]-fixed the password error warning

* [fix]-fixed the password error warning

* [fix]-fixed the password error warning

* [fix]-fixed the password error warning

* [feat]-added test cases for password error warning

* [feat]- added test cases for password error warning

* [feat]- added test cases for password error warning

* [fix]- fixed the linting

* [fix]- fixed the pagination alignment issue

* [fix]- fixed the pagination alignment issue

* [fix]- fixed the pagination alignment issue

* Removed overlapping (#675)

* changes input element to textarea and changes in test (#710)

* Code Coverage @90.7%

* Indicating active tabs (#691)

* added underline to active links in navbar

* fixed lint error

* fixed the org default image #688 and removed stock image (#695)

* fixed the org default image #688 and removed stock image

* removed eslint warning

* added new img as default org img

* Update INSTALLATION.md

* Added Clear Error and Warn Messages when API is unavailable (#670)

* Added error and warn messages

* Added tests & fixed inconsistency in mocks

* Lint fix LoginPage

* Lint Fix LoginPage.test

* minor fix

* Minor update to LoginPage

* Minor change to LoginPage.test

* Replaced toast.warn() with toast.error()

* Fixed test accordingly

* Lint Fix

* Minor fix

* Extra edge case handled

* code coverage fix

* Lint fix

* Update LoginPage

* Update LoginPage.test

* Lint fix

* improve test coverage for orgpost.tsx (#718)

* Improve test coverage for calendar.tsx

* Restore previous tests

* remove --coverage

* improve test for orgpost.tsx

* Implemented Proper Error Handling for all Screens [Fixes: #535] (#731)

* Handled error cases for all screens

* Some more fixes

* Some more fixes

* Added StaticMockLink to use Mocks multiple times [Fixes Multiple Issues] (#745)

* add StaticMockLink

* lint fix

* remove showWarning

* Added prompt to Register on Login Page (#628)

* Add prompt to Login page
- Add prompt in other languages: fr, sp, hi, zh.
- switch styling of Login Button with Reg Button

* format with prettier

* fixed event checkboxes to update (#707)

* Block/Unblock functionality for only members of the organization (#690)

* Implememnted manage functinality for admin/superadmin after login

* Update AdminDashListCard.module.css

* Some formatting issues with module file

* resolved workflow issues

* Updated block/unblock page preventing users who are not members of organiztion

* Update BlockUser.test.tsx to resolve failing tests

Modified the mocks fields according to the corresponding changes in BlockUser.tsx file.

* created a reusable postNotFound Component with responsive UI (#717)

* created a reusable postNotFound Component with responsive UI

* run test error solved

* added translation to the component and also created the test.tsx for the error component

* fixed the failing test and added the postNotFound reusable component for OrgList

---------

Co-authored-by: thesaaddevloper <[email protected]>

* fix: #601 modal responsive width (#621)

* added dynamic title to OrgPeople section (#704)

* added dynamic title to OrgPeople section

* fixed code coverage

* fixed code coverage

* uncommented the mistakenly added code

* Delete er

* Updated session timeout notification toast with already existing one (#734)

* Added a toast to notify users that session has expired and redirects to the login page

* Updated toast notification on session timeout  with already existing one

* eliminated the use of  magic numbers

* minor error correction on the timeout minutes

---------

Co-authored-by: TheoCathy <[email protected]>

* Fixed the empty space in the OrgList (#751)

* created a reusable postNotFound Component with responsive UI

* run test error solved

* added translation to the component and also created the test.tsx for the error component

* fixed the failing test and added the postNotFound reusable component for OrgList

* fixed the empty space in orgList

* fixed the failing test

* removed the unwanted files

---------

Co-authored-by: thesaaddevloper <[email protected]>

* align navbar items (#755)

* align navbar items

* replace More with a hamburger icon

* replace More with a hamburger icon to fix workflow error

* replace More with a hamburger icon to fix workflow error

* Fixes: toggle password for registration  (#758)

* added toggle-password

* updated

* formatting

* added icon for toggle password

* Super Admin Dashboard Error When Organizations Absent (#754)

* No Organization Warning on OrgList

* Minor Fix

* Fixed failing tests

* Added Warning on Roles and Request Pages

* Added Tests for OrgList

* Testing Fixes

* Added more tests

* Added Tests for Roles and Request Pages

* Code Coverage @ 91.0%

* Add link to dashboard admin card (#760)

* image upload made functional (#677)

* image upload made functional

* lint

* fixed failing test

* linting

* re run test , remove yarn.lock changes

* updateUser test cov

* OrgPost

* rerun tests

* Empty commit

* reverted last 2 commits changes

* re run code cov

* update userUpdate

* rerun code cov again

* revert last commit

* Update PR_GUIDELINES.md

* Implemented Search bar and the radio buttons in orgPost page that searches both title and text of post (#770)

* created a reusable postNotFound Component with responsive UI

* run test error solved

* added translation to the component and also created the test.tsx for the error component

* fixed the failing test and added the postNotFound reusable component for OrgList

* fixed the empty space in orgList

* fixed the failing test

* removed the unwanted files

* the one search bar which searches both text and title of post

* testing file

* orpost file testing

* code coverage is increased

* fixed the failing test

---------

Co-authored-by: thesaaddevloper <[email protected]>
Co-authored-by: saadabban76 <�[email protected]>

* center org image on mobile (#778)

Signed-off-by: Ekene Nwobodo <[email protected]>

* removed link for plugin dropdown toggle (#781)

* removed link for plugin dropdown toggle

* added id

* align superadmin nav items and fix failed tests (#766)

* changed the handleSearchByName function in searchByName in Roles page (#735)

* changed the handleSearchByName function to search using target's value instead of searchByName variable

* updated the file Roles.tsx to take care of useState lag

* changed tests for suiting searchByName

* changed tests for searchByName including backspaces

* added tests for paginationList and changing rowsPerPage

* added tests to increase coverage in Roles.tsx

* changed the package.json file's test command

* removed extra scrollbars (#800)

* Recently added Post displays at top (#773)

* Recently added Post displays at top

* reversed the posts as required in the query

* Increased the OrgList Code Coverage (#786)

* increased the orgList coverage to 95$

* increased the orgList Code Coverage

* increased the orgList Code Coverage

* increased the orgList Code Coverage

* fixed image rendering in orgPost page

* increased the code coverage for orgList Component

* increased code coverage to 97% in orgList Component

---------

Co-authored-by: saadabban76 <�[email protected]>

* Modify event visibility for non-admins (#796)

* Modify event visibility for non-admins

Signed-off-by: Ekene Nwobodo <[email protected]>

* Add test suites for events visibilty

---------

Signed-off-by: Ekene Nwobodo <[email protected]>

* Bug Fix: Drawer menu visibility (#794)

* Remove filter by event field (#807)

* increased the orgList coverage to 95$

* increased the orgList Code Coverage

* increased the orgList Code Coverage

* increased the orgList Code Coverage

* fixed image rendering in orgPost page

* increased the code coverage for orgList Component

* increased code coverage to 97% in orgList Component

* removed the filter by event section in orgPeople's component

* fixed the failing test

---------

Co-authored-by: saadabban76 <�[email protected]>

* Add image to post (#804)

* increased the orgList coverage to 95$

* increased the orgList Code Coverage

* increased the orgList Code Coverage

* increased the orgList Code Coverage

* fixed image rendering in orgPost page

* increased the code coverage for orgList Component

* increased code coverage to 97% in orgList Component

* added Image to the post's card

* replaced external links with codebase default image

* replaced external links with codebase default image

* replaced blank image with the default image

* fixed the failing test

---------

Co-authored-by: saadabban76 <�[email protected]>

* Update pull-request-target.yml

* Update pull-request-target.yml

* Update pull-request-target.yml

* Update pull-request-target.yml

* Update pull-request-target.yml

* Update pull-request-target.yml

* Upgrade Yarn to NPM in Talawa Admin Project (#802)

* npm upgrade

* remove package lock

* Update push.yml

* empty

* upgrade yarn to npm

* fix docs

* fix scripts

* empty

* stop watch mode

* fix ymls

* empty

* fix scripts

* empty commit

* update scripts

* Redirect to dashboard on organization update (#816)

* Redirect to dashboard on organization update

* Minor Change

* Proper Testing Of Pagination In All List Views (#797)

* install faker package used for mocks in tests

* Test init for pagination

* install dependencies needed to implement certain tests

* add a data-testid attribute to their markup for use in tests

* add data-testid attributes to its markup being referenced from tests

* add test to ensure the number of organization displayed on the page corresponds to the option selected from rowsPerPage

* add prop to allow rendering of component in test environment

* add data-testid attributes to their markup being referenced from tests

* add data-testid attributes to its markup being referenced from tests

* add test to affirm that the number of persons displayed on the webpage is same with the selected option from rowsPerPage

* install dependencies for certain tests

* fix lint errors

* tests fix

* remove unnecessary dependencies

* lint fix

* tests fix update

* restore file to previous state

* empty commit

* tests fix update

* lint fix

* Conditional Usage of Google reCAPTCHA [Fixes #798] (#820)

* conditonal recaptcha

* Update INSTALLATION.md

* add tests

* fixed the issue of Mismatched passwords validation #722 (#824)

* fixed the issue of Mismatched passwords validation #722

* fixed lint code error

* Code Coverage @ 92%

* Replace Talawa Portal with Talawa Admin Portal #817 (#821)

* Update website title to Talawa Admin Portal in en

* Update website title in fr json file

* Update website title in sp json file

* Update website title in zh json file

* Update website title in hi json file

* Update the test in ListNavbar file

* Update the test in LoginPage.test file

* Create a function for the tex macher to make test

* Fix lint errors in the LandingPage test file

* Remove console.log in LandingPage test file

* Upgrade to use npm instead of yarn

* Delete yarn.lock file

* Fix lint errors

* Fix lint errors

* Update the heading in hi.json file

* Remove unused codes

* Fix lint error in LanfingPage file

* Correct the talawa_portal value in Fr json file

* Correct the talawa_portal value in sp json file

* Remove anused package in package.json file

* Organization Form Redirect Issue Prevents User Navigation, Affecting User Experience.  Issue #808 (#815)

* addressing issue #808

* finished - requested changes

* addressing warning

* Added:  event preview modal to view event details (#772)

* added event preview model

* added event preview model

* fixed formatting

* added test

* added test

* added test

* failing tests

* test

* tests

* Update workflow (#832)

* Workflow fix (#833)

* Update pull-requests.yml

* Update pull-requests.yml

* Update pull-requests.yml

* Code Coverage @ 91.0%

* Feature: Separation of ADMIN and SUPERADMIN functionalities (#826)

* Initial changes

* Commit to sync repo

* Made changes to OrgList

* Some fixes

* Minor fix

* Added tests for OrgList

* Added tests for OrgList

* Coverage fix

* Required changes added

* Made changes to OrgList

* Some fix

* Some fixes

* fixes test for OrgList

* Some more fixes

* Empty commit

* Lint fix

* Fixed test

* Lint fix

* Added Whitespace Validation to Organization and Post create forms (#838)

* Added whitespace check in Org Create form

* Added Tests

* Added Empty String check to OrgPost Form

* Added Tests for OrgPost

* fixed the issue of Toast msg is not available in all languages #740 (#845)

* fixed the issue of Toast msg is not available in all languages #740

* format issue

* Empty-Commit

* Fixed Org Update (#843)

* Prevent Admins and Super Admins from downgrading their own roles (#840)

* Code Cleanup

* Disabled Super Admins from changing their roles

* Added Tests

* Added more tests

* Improved Code Quality

* Revert "Fixed Org Update (#843)" (#847)

This reverts commit 53c3fef28ef986d63b1eec45663acb7d07cf1b8d.

* Fixed Organization Update and Translation (#849)

* Fixed Organization Update

* Minor Changes

* Success message updated

* Fail tests on warning [Priority Needed] (#856)

* fix warnings

Signed-off-by: Ansh Goyal <[email protected]>

* fix warnings

Signed-off-by: Ansh Goyal <[email protected]>

* fix warnings

Signed-off-by: Ansh Goyal <[email protected]>

* fix warnings

Signed-off-by: Ansh Goyal <[email protected]>

* fix warnings

Signed-off-by: Ansh Goyal <[email protected]>

* restore addonregister

Signed-off-by: Ansh Goyal <[email protected]>

---------

Signed-off-by: Ansh Goyal <[email protected]>

* Code duplicacy removed (#852)

* Code duplicacy removed

* Tests added

* Added comments

* Fixed failing tests

* Code formatted

* Unused packages removed, flag icons package updated to latest version (#860)

* Unused packages removed, flag icons updated to latest version

* Empty commit

* Changes in package-lock.json

* Fixes #848: limiting mulitple toast (#851)

* limiting-toast

* added test

* Organization People Filters Improved (#855)

* Added Filters to Users and Organizations Query

* Added Last Name Filter on User, Member and Admin

* Added Translation

* Fixed Failing Tests

* Added Tests for Filters

* Fixed Failing Tests

* Code Cleanup

* Fixed Tests

* Added Translation

* remove graphql-boost dep (#866)

Signed-off-by: Ansh Goyal <[email protected]>

* added UserNotFound component to the Roles page and improved the search (#865)

* changed the handleSearchByName function to search using target's value instead of searchByName variable

* updated the file Roles.tsx to take care of useState lag

* changed tests for suiting searchByName

* changed tests for searchByName including backspaces

* added tests for paginationList and changing rowsPerPage

* added tests to increase coverage in Roles.tsx

* changed the package.json file's test command

* changed PostNotFound component to be used as a reusable one and added it in Roles section and set languages option in locales folder

* changed formatting in locales changed files

* removed comments in Roles.tsx

* Empty commit

* renamed the PostNotFound component and modifiied relevant files

* changed Roles.tsx filtering

* empty commit

* reverted changes in package.json

* Improved signupform validations (#828)

* Improved signupform validations

* updated signup form validation to show all messages at once

* improved test coverage for LoginPage

* Fixed failing test

---------

Co-authored-by: Joyce Malicha <[email protected]>

* added tests for Search Bar in the Organization List Page of SUPERADMIN #827 (#867)

* added tests for Search Bar in the Organization List Page of SUPERADMIN #827

* added tests for Search Bar in the Organization List Page of SUPERADMIN #827

* Added Tests Previews (#868)

* Installed jest-preview

* Automatic Setup

* Fiixed Failing Test Command

* Added Basic CSS

* Added PostCSS Module

* Fixed MUI Styling

* Minor Changes

* Added cross-env to support windows

* Adaptar for React 17 and CSS Modules Mock

* Added Mocked Styles to Tests

* Documentatin Updated

* Fixed Failing Tests

* Minorr change in documentation

* Jest is now Dev Dependency

* Workflow Test

* Jest Module Path Updates

* Module Path Tese 2

* Github Workflow Fixed

* Removed Legacy Test Command

* Added Documentation to Debug Tests

* Fixed Documentation

* Docs Image Added To Repo

* Images Reorganization

* Organized Images

* Revert "Improved signupform validations (#828)" (#875)

This reverts commit 5820dd9ec05256551b48470c8880fcdc05452fda.

* Restored SearchBar Test for OrgList Page (#878)

* Restored searchBar test

* Lint fix

* Coverage fix

* Lint fix

* Some fixes

* Some fixes

* fixed the issue of Users filter to fetch corresponding Users to Organisation #701 (#853)

* fixed the issue of Users filter to fetch corresponding Users to Organisation #701

* removedd uunused variable

* fixed failing text

* fixed merged issue

* fixed lint error

* swap variable

* Revert "Restored SearchBar Test for OrgList Page (#878)" (#879)

This reverts commit 3d39c524d54e81853490d2d8a1f844ce67252365.

* Fixed crashing on error in Block/Unblock page (#862)

* Website crash fixed

* lint fixed

* Added tests for empty response from server

* More tests added

* Rerun tests empty commit

* Redirect on error functioning

* Fixed failing tests

* Testcase and Title added when users not found

* Linting fixed

* Typo fixed

* Fixed failing tests

* Linting fixed

* Added NotFound component in OrgPeople and changed Roles.tsx  (#882)

* changed the handleSearchByName function to search using target's value instead of searchByName variable

* updated the file Roles.tsx to take care of useState lag

* changed tests for suiting searchByName

* changed tests for searchByName including backspaces

* added tests for paginationList and changing rowsPerPage

* added tests to increase coverage in Roles.tsx

* changed the package.json file's test command

* changed PostNotFound component to be used as a reusable one and added it in Roles section and set languages option in locales folder

* changed formatting in locales changed files

* removed comments in Roles.tsx

* Empty commit

* renamed the PostNotFound component and modifiied relevant files

* changed Roles.tsx filtering

* empty commit

* reverted changes in package.json

* added NotFound component in OrgPeople, made changes in the locales files and made some changes to Roles too

* added NotFound component to OrgPeople, changerd locales files and changed Roles.tsx

* minor change

* Restored Search-Bar Test for OrgList Page (#880)

* Restored searchBar test

* Lint fix

* Coverage fix

* Lint fix

* Some fixes

* Some fixes

* Fixed Org Dashboard Error (#873)

* Fixed TypeError

* Minor Change

* Fixed Tests

* Added back logo512

* Fixed auth header getting copied on login (#890)

* fix user update  (#876)

* fix user detials update

* remove userType from update-user page

* fix failed test for userUpdate.test.tsx

* Removed and Replaced Ant Design from the project (#891)

* Fixed auth header getting copied on login

* Removed/Replaced  Ant Design from the project

* Fixed failing tests

* Removed comment

* Add today functionality in calendar (#897)

* Update countline.py

* Update pull-requests.yml

* Updated countlines.py to cover .spec. files (#900)

Co-authored-by: Peter Harrison <[email protected]>

* fixed the Inability to set user roles for specific organizations #556 (#898)

* fixed the Inability to set user roles for specific organizations #556

* added all language translation

* Revert "fixed the Inability to set user roles for specific organizations #556 (#898)" (#901)

This reverts commit 891d898eb5543116bb9042a6386b5a12e474159c.

* Documentation updated, Redundant css files removed (#896)

* Doc updated unused files removed

* Removed unused css files from setup tests

* Added small calendar in the events #887  (#903)

* added small clanedar

* added small clanedar

* fixed Code Coverage: Create tests for OrgSettings.tsx #396 (#905)

* remove redundancy from orgPostCard (#906)

* Revert "remove redundancy from orgPostCard (#906)" (#910)

This reverts commit d5ce4aa27ee241b0687f7db3d6acd1b62339562f.

* Block/Unblock Page Improvements (#885)

* Added Radio Buttons

* Optimized Queries

* Optimized Query and Added Last Name Filter

* Radio Button Working

* Added Translations

* Fixed Filter Name

* Fixed Debounce

* Fixed Asynchronous Debounce

* Added Tests

* Better Error and Loading State Handline

* Fixed Loader

* Fixed Loader

* Modulrised Mock Data

* Minor Change

* Fixed Tests

* Increase Coverage

* User query replaced with OrgMemberConnection

* Fixed Tests

* Code Coverage Increase

* Code Cov

* Fixed Translations

* Fixed Failing Tests

* fix in failing test (#913)

* Improve and Standardize Automated Linting Tests (#916)

* added linting rules

* added linting rules

* added linting rules

* Rename `data` variables to more readable name [Fixes #829] (#835)

* Refactor screens

* Update components

* Fix test

* Fix typecheck errors

* Increase test coverage

* Merge latest adminUI-Redesign into Develop (#927)

* Updated CODE_STYLE.md

* Updated CODE_STYLE.md (#917)

* Updated CODE_STYLE.md

* Import section update

* Upgrade and Migrate from Bootstrap 4 to Bootstrap 5 (#925)

* Updated CODE_STYLE.md

* Latest Boostrap v5.3.0 & react-bootstrap v2.7.4 installed

* Buttons replaced from normal ones to Bootstrap ones

* Import section update

* Error fixed for Buttons

* Language dropdowns and Change language

* InputBoxes & Checkboxes fixed and imported from BS

* Removed unused package popper.js

* Replaced react-modal with Bootstrap one in Login Page

* Modals converted to React Bootstrap one

* Completely replaced react-modal with react-bootstrap/Modal from the project

* Removed react-modal from the project

* Removed classbased modal and unused images

* Notification navbar migrated

* Modal migration

* Modal migration

* Modal migration done for OrgPostCard

* Empty commit to make workflow run

* Empty commit to make workflow run

* Empty commit to run the workflow

---------

Co-authored-by: Anwer Sayeed <[email protected]>

* Introduces API versioning check in CI/CD (#924)

* a random change

* husky precommit

* one more try

* one more try

* one more try

* one more try

* one more try

* one more try

* second try

* removed unwanted deps

* removed unwanted deps

* resolved the error

* updated variable name

* rerun test

* rerun test

* added test to pull.yml

* removed push check

* resolved conflict

* Update stale.yml

* Update CONTRIBUTING.md

* Merge talawa-user-portal into develop (#935)

* Create login and register page for user portal

* Lint public locales

* Create tests for login page components

* Add react import in tests

* Create organizations screen for user portal

* Fix failing tests and lint code

* fix failing tests

* Add tests for organization screen and componenets

* Fix non-null assertions

* Fix non-null assertions in organizations test

* Fix bootstrap migration changes

* Merge latest Admin UI Redesign into Develop (#934)

* Updated CODE_STYLE.md

* Updated CODE_STYLE.md (#917)

* Updated CODE_STYLE.md

* Import section update

* Upgrade and Migrate from Bootstrap 4 to Bootstrap 5 (#925)

* Updated CODE_STYLE.md

* Latest Boostrap v5.3.0 & react-bootstrap v2.7.4 installed

* Buttons replaced from normal ones to Bootstrap ones

* Import section update

* Error fixed for Buttons

* Language dropdowns and Change language

* InputBoxes & Checkboxes fixed and imported from BS

* Removed unused package popper.js

* Replaced react-modal with Bootstrap one in Login Page

* Modals converted to React Bootstrap one

* Completely replaced react-modal with react-bootstrap/Modal from the project

* Removed react-modal from the project

* Removed classbased modal and unused images

* Notification navbar migrated

* Modal migration

* Modal migration

* Modal migration done for OrgPostCard

* Empty commit to make workflow run

* Empty commit to make workflow run

* Empty commit to run the workflow

* Sass filed added with documentation

* Linting fixed

* Fixed the folder structure and naming convention

* Customised Bootstrap  (#929)

* Sass filed added with documentation

* Linting fixed

* Fixed the folder structure and naming convention

* Assets typo fixed

* Typo fix

* Merge conflict error fixed

---------

Co-authored-by: Anwer Sayeed <[email protected]>

* test PR for API versioning check (#932)

* testPR

* test2

* testing the change

* testing it again

* test--no-verify

* test--no-verify

* echo token

* test-again

* test-again

* test

* test

* read-only

* clone

* clone

* redesigned newsfeed (#939)

* Revert "redesigned newsfeed (#939)" (#943)

This reverts commit a645eca7cf2ce1335374f48b52335a293e344580.

* Make Talawa-Admin mutations in sync with the backend (#946)

* Initial change

* Redundant Notification removed

* Fixed linting and other issues

* Tests fixed

* Add Home Screen And People Screen along with other components (#940)

* Create login and register page for user portal

* Lint public locales

* Create tests for login page components

* Add react import in tests

* Create organizations screen for user portal

* Fix failing tests and lint code

* fix failing tests

* Add tests for organization screen and componenets

* Fix non-null assertions

* Fix non-null assertions in organizations test

* Fix bootstrap migration changes

* Add Home Screen along with other components

* Fix failing tests

* Add required tests and Offcanvas navbar

* Remove unused variables from tests

* Sync the Mutations with talawa-api

* Merge AdminUI-Redesign into Develop (#947)

* Updated CODE_STYLE.md

* Updated CODE_STYLE.md (#917)

* Updated CODE_STYLE.md

* Import section update

* Upgrade and Migrate from Bootstrap 4 to Bootstrap 5 (#925)

* Updated CODE_STYLE.md

* Latest Boostrap v5.3.0 & react-bootstrap v2.7.4 installed

* Buttons replaced from normal ones to Bootstrap ones

* Import section update

* Error fixed for Buttons

* Language dropdowns and Change language

* InputBoxes & Checkboxes fixed and imported from BS

* Removed unused package popper.js

* Replaced react-modal with Bootstrap one in Login Page

* Modals converted to React Bootstrap one

* Completely replaced react-modal with react-bootstrap/Modal from the project

* Removed react-modal from the project

* Removed classbased modal and unused images

* Notification navbar migrated

* Modal migration

* Modal migration

* Modal migration done for OrgPostCard

* Empty commit to make workflow run

* Empty commit to make workflow run

* Empty commit to run the workflow

* Sass filed added with documentation

* Linting fixed

* Fixed the folder structure and naming convention

* Customised Bootstrap  (#929)

* Sass filed added with documentation

* Linting fixed

* Fixed the folder structure and naming convention

* Assets typo fixed

* Typo fix

* Initial login page work

* Merge conflict error fixed

* Theming modified and Added Loader over every screen

* Fixed UI issue for navbar and login

* Fixed production bug

* Removed unused variable

* Tests fixed

* Added Change Language Btn dropdown

* Merge conflict fixed, merge latest develop into adminUI-redesign (#938)

* Merge latest adminUI-Redesign into Develop (#927)

* Updated CODE_STYLE.md

* Updated CODE_STYLE.md (#917)

* Updated CODE_STYLE.md

* Import section update

* Upgrade and Migrate from Bootstrap 4 to Bootstrap 5 (#925)

* Updated CODE_STYLE.md

* Latest Boostrap v5.3.0 & react-bootstrap v2.7.4 installed

* Buttons replaced from normal ones to Bootstrap ones

* Import section update

* Error fixed for Buttons

* Language dropdowns and Change language

* InputBoxes & Checkboxes fixed and imported from BS

* Removed unused package popper.js

* Replaced react-modal with Bootstrap one in Login Page

* Modals converted to React Bootstrap one

* Completely replaced react-modal with react-bootstrap/Modal from the project

* Removed react-modal from the project

* Removed classbased modal and unused images

* Notification navbar migrated

* Modal migration

* Modal migration

* Modal migration done for OrgPostCard

* Empty commit to make workflow run

* Empty commit to make workflow run

* Empty commit to run the workflow

---------

Co-authored-by: Anwer Sayeed <[email protected]>

* Introduces API versioning check in CI/CD (#924)

* a random change

* husky precommit

* one more try

* one more try

* one more try

* one more try

* one more try

* one more try

* second try

* removed unwanted deps

* removed unwanted deps

* resolved the error

* updated variable name

* rerun test

* rerun test

* added test to pull.yml

* removed push check

* resolved conflict

* Sass filed added with documentation

* Linting fixed

* Fixed the folder structure and naming convention

* Update stale.yml

* Typo fix

* Update CONTRIBUTING.md

* Merge talawa-user-portal into develop (#935)

* Create login and register page for user portal

* Lint public locales

* Create tests for login page components

* Add react import in tests

* Create organizations screen for user portal

* Fix failing tests and lint code

* fix failing tests

* Add tests for organization screen and componenets

* Fix non-null assertions

* Fix non-null assertions in organizations test

* Fix bootstrap migration changes

* Merge conflict error fixed

---------

Co-authored-by: Anwer Sayeed <[email protected]>
Co-authored-by: Kanishka Bansode <[email protected]>
Co-authored-by: Peter Harrison <[email protected]>
Co-authored-by: Noble Mittal <[email protected]>

* Random checkout

* Design ready for homescreen

* Login page 100% code c=coverage

* Login page icon adjustment

* Added translations

* Fixed the failing tests

* Revert to older version of loader

* Animation added fixed warnings

* Fixed accessability

* Mutations and Tests foxed

* Fixed coloring in UserPortal

* Tests fixed and ChangeLanguageDropdown used in UserLoginPage

* Linting Fixed

---------

Co-authored-by: Anwer Sayeed <[email protected]>
Co-authored-by: Kanishka Bansode <[email protected]>
Co-authored-by: Peter Harrison <[email protected]>
Co-authored-by: Noble Mittal <[email protected]>

* Merge latest adminUI-Redesign (#950)

* Initial Organizations screen done

* Removed yellow scrollbar

* Linting fixed

* Replaced images with svgs for logos

* Styling done for btnsContainer

* Better typechecking and readability

* Animated Drawer working

* Responsive page ready

* OrgCard responsive

* Fixed navbar issue and added webkit keyframes

* LeftDrawer ready

* Translations added

* Added shimmer loading effect

* Styling issue fixed

* Failing tests fixed for OrgList

* Removed unused vars

* Tests done for LeftDrawer

* Succesfully made component without causing any breaking change

* 100% Code coverage achieved for Requests Screen

* Fix alignment

* Roles screen UI done

* Role screen fixed with 100% test coverage

* Changing screen activeness fixed

* Unused vars and Typos fixed

* Language support added

* Linting and typos fixed

* Fixed failing tests for LeftDrawer

* Completed tests of AdminDashListCard with 100% code coverage

* OrgListCard done

* Finalised tests

* Requests user search made functional again !

* Fixed loading on refetch and UX on all screens

* OrgList failing errors fixed

* Fixed all failing tests

* Achieved 100% code coverage for OrgList.tsx

* Wrote tests and mod LeftDrawer for admins

* Minor ui issue fixed

* Fixed failing test

* UI bug dropdown

* Frontend insync with Backend attempt 1

* Introspection fail fix 1

* Introspection error fix 3

* Introspection error fix another attempt

* Another attempt

* [Talawa-user-portal] Add Settings and Donate Screen, along with other UI fixes (#953)

* Create login and register page for user portal

* Lint public locales

* Create tests for login page components

* Add react import in tests

* Create organizations screen for user portal

* Fix failing tests and lint code

* fix failing tests

* Add tests for organization screen and componenets

* Fix non-null assertions

* Fix non-null assertions in organizations test

* Fix bootstrap migration changes

* Add Home Screen along with other components

* Fix failing tests

* Add required tests and Offcanvas navbar

* Remove unused variables from tests

* Sync the Mutations with talawa-api

* Add Settings and Donate Screen

* Add multilingual support for the screens

* Add Event Project and Volunteer Management (#961)

* Add screens for adding and updating event projects

* Add delete operation for event projects and debug update

* Remove yarn.lock

* Begin testing

* Add display of tasks and functionality to add tasks

* Add modal for edit task

* Add UpdateTaskModal

* Add Delete Task Modal and volunteers display

* Add test for DeleteEventProjectModal.tsx

* Add tests for add and update event project modal

* Add screen for managing volunteers

* Add option to assign and remove volunteers

* Add tests for AddTaskModal.tsx

* Add tests for TaskListItem.tsx and DeleteTaskModal.tsx

* Complete testing for all Task Modals

* Add completed display to tasks

* Add tests for event dashboard

* Restructure files

* Add attendee management modal

* Add testing for EventAttendeeModal

* Move to 100% testing and wrapper for attendees modal

* Add basic checkIn functionality for users

* Add testing for CheckIn modals

* Introduce the tag generation into the repository

* Update linting rule and fix errors

* Remove alloted seat and alloted room

* Fix testing

* Correct some tests

* Migrate from attendees to registrants

* Migrate Event Project modals to new design

* Migrate registrants modals and checkin modals to new design with 100% test coverage

* Move task modals to new styles

* Move to 100% test coverage

* Admin workflow completed with updated package.json (#960)

* Merge latest AdminUI Redesign into develop (#956)

* Initial Organizations screen done

* Removed yellow scrollbar

* Linting fixed

* Replaced images with svgs for logos

* Styling done for btnsContainer

* Better typechecking and readability

* Animated Drawer working

* Responsive page ready

* OrgCard responsive

* Fixed navbar issue and added webkit keyframes

* LeftDrawer ready

* Translations added

* Added shimmer loading effect

* Styling issue fixed

* Failing tests fixed for OrgList

* Removed unused vars

* Tests done for LeftDrawer

* Succesfully made component without causing any breaking change

* 100% Code coverage achieved for Requests Screen

* Fix alignment

* Roles screen UI done

* Role screen fixed with 100% test coverage

* Changing screen activeness fixed

* Unused vars and Typos fixed

* Language support added

* Linting and typos fixed

* Fixed failing tests for LeftDrawer

* Completed tests of AdminDashListCard with 100% code coverage

* OrgListCard done

* Finalised tests

* Requests user search made functional again !

* Fixed loading on refetch and UX on all screens

* OrgList failing errors fixed

* Fixed all failing tests

* Achieved 100% code coverage for OrgList.tsx

* Wrote tests and mod LeftDrawer for admins

* Minor ui issue fixed

* Fixed failing test

* UI bug dropdown

* Frontend insync with Backend attempt 1

* Introspection fail fix 1

* Introspection error fix 3

* Introspection error fix another attempt

* Another attempt

* Fixed Default Animation on Organizations Screen

* Fixed typo

* Loading data from localstorage functional

* Fixed name conventions

* Fixed typo

* UI Fix

* Changed screen name

* Table Loader added

* Added LeftOrg drawer and Organization screen comp to Screens

* routesReducer tests fixed

* Redundant adminNavbar removed from project

* MemberDetail issue fixed

* Achieved 100% code coverage for LeftDrawerOrg, Added Empty div in images

* Fixed failing tests

* Fix tests

* Fixed warnings

* Linting fixes

* Linting issues fixed

* Achieved 100% code coverage for CollapsibleDropdown

* Achieved 100% CC on IconComponent and removed useless imports

* Achieved 100% cc for LeftDrawer Component

* Achieved 100% CC on SuperAdminScreen Component

* Fixed typo

* Integrated Event Dashboard

* Failing tests for LeftDrawer LeftDrawerOrg OrgList screen fixed

* Removed redundant code

* Removed useless imports

* Linting fixed

* Removed LeftDrawerOrg

* Update documentation

* copy-docs -to-talawa branch update to develop

* removed dependance of code copying from generate segment

* Update push.yml (#969)

* Update push.yml (#970)

* Feature Request: Adding a dialog to go to plugin store after an organization is created by the admin (#951)

* Add/ test for OrgPost.tsx

* fix:  org post back to default

* Added Dialog 2

* Updated Dialog UI

* Removed Extra code

* Updated Plugin store

* fix: warnings and solves #951  & #948

* fix: warnings and solves #951  & #948

* fix: warnings and solves #951  & #948

* Fix: UI Redesign

* fix: merge

* fix

* Update AddOnStore.tsx

* Fixed Merge Errors

* Add test: for OrgEntry

* Test 3

* fix test 4

* Merge latest AdminUI Redesign into develop (#972)

* Initial Organizations screen done

* Removed yellow scrollbar

* Linting fixed

* Replaced images with svgs for logos

* Styling done for btnsContainer

* Better typechecking and readability

* Animated Drawer working

* Responsive page ready

* OrgCard responsive

* Fixed navbar issue and added webkit keyframes

* LeftDrawer ready

* Translations added

* Added shimmer loading effect

* Styling issue fixed

* Failing tests fixed for OrgList

* Removed unused vars

* Tests done for LeftDrawer

* Succesfully made component without causing any breaking change

* 100% Code coverage achieved for Requests Screen

* Fix alignment

* Roles screen UI done

* Role screen fixed with 100% test coverage

* Changing screen activeness fixed

* Unused vars and Typos fixed

* Language support added

* Linting and typos fixed

* Fixed failing tests for LeftDrawer

* Completed tests of AdminDashListCard with 100% code coverage

* OrgListCard done

* Finalised tests

* Requests user search made functional again !

* Fixed loading on refetch and UX on all screens

* OrgList failing errors fixed

* Fixed all failing tests

* Achieved 100% code coverage for OrgList.tsx

* Wrote tests and mod LeftDrawer for admins

* Minor ui issue fixed

* Fixed failing test

* UI bug dropdown

* Frontend insync with Backend attempt 1

* Introspection fail fix 1

* Introspection error fix 3

* Introspection error fix another attempt

* Another attempt

* Fixed Default Animation on Organizations Screen

* Fixed typo

* Loading data from localstorage functional

* Fixed name conventions

* Fixed typo

* UI Fix

* Changed screen name

* Table Loader added

* Added LeftOrg drawer and Organization screen comp to Screens

* routesReducer tests fixed

* Redundant adminNavbar removed from project

* MemberDetail issue fixed

* Achieved 100% code coverage for LeftDrawerOrg, Added Empty div in images

* Fixed failing tests

* Fix tests

* Fixed warnings

* Linting fixes

* Linting issues fixed

* Achieved 100% code coverage for CollapsibleDropdown

* Achieved 100% CC on IconComponent and removed useless imports

* Achieved 100% cc for LeftDrawer Component

* Achieved 100% CC on SuperAdminScreen Component

* Fixed typo

* Integrated Event Dashboard

* Failing tests for LeftDrawer LeftDrawerOrg OrgList screen fixed

* Removed redundant code

* Removed useless imports

* Linting fixed

* Removed LeftDrawerOrg

* Dashboard screen ui almost ready

* Org Dash ready

* Block/Unblock screen ready

* Organization settings page ready

* Lang changes

* Page refresh on updating org removed

* OrgUpdate tests done

* OrgUpdate 100% test coverage achieved

* OrgSettings Tests done

* Organization Dashboard Cards done

* Organization Dashboard achieved 100% CC

* 100% CC achieved for BlockUser screen

* Finalised changes

* Small change

* Tests fixed

* Separate OrgSettings component made

* Linting fixed

* Formatting fixed

* Events screen and Post Comment Modal for Talawa-user-portal  (#963)

* Create login and register page for user portal

* Lint public locales

* Create tests for login page components

* Add react import in tests

* Create organizations screen for user portal

* Fix failing tests and lint code

* fix failing tests

* Add tests for organization screen and componenets

* Fix non-null assertions

* Fix non-null assertions in organizations test

* Fix bootstrap migration changes

* Add Home Screen along with other components

* Fix failing tests

* Add required tests and Offcanvas navbar

* Remove unused variables from tests

* Sync the Mutations with talawa-api

* Add Settings and Donate Screen

* Add multilingual support for the screens

* Add events screen without calendar view

* Add multilingual support to Events screen

* Fix failing tests due to merge

* Add Post Comment functionality

* Refactor Events tests

* Deprecate event registrants from query

* Update README.md

* Add My Tasks screen and Fix UI bugs [User Portal] (#978)

* Create login and register page for user portal

* Lint public locales

* Create tests for login page components

* Add react import in tests

* Create organizations screen for user portal

* Fix failing tests and lint code

* fix failing tests

* Add tests for organization screen and componenets

* Fix non-null assertions

* Fix non-null assertions in organizations test

* Fix bootstrap migration changes

* Add Home Screen along with other components

* Fix failing tests

* Add required tests and Offcanvas navbar

* Remove unused variables from tests

* Sync the Mutations with talawa-api

* Add Settings and Donate Screen

* Add multilingual support for the screens

* Add events screen without calendar view

* Add multilingual support to Events screen

* Fix failing tests due to merge

* Add Post Comment functionality

* Refactor Events tests

* Deprecate event registrants from query

* Add my tasks screen for user portal

* Remove unnecessary comments from test files

* Add Feedback UI Components to Talawa Admin (#980)

* Add feedback component

* Add tests for feedback modal

* Add handling for empty feedback

* Add Average Rating and Reviews component

* Add testing for all the added cards

* Fix tests and move to 100% coverage

* Add bugfix

* Add merge function to fix failing tests

* Add key definitons

* Change merge policy

* Add custom merge policy to all the Event Stat tests

* remove cache

* Migrate to a single query in the parent

* Adding Plugin Logic to the Talawa Mobile Web App (#976)

* Add/ test for OrgPost.tsx

* fix:  org post back to default

* Added Dialog 2

* Updated Dialog UI

* Removed Extra code

* Updated Plugin store

* fix: warnings and solves #951  & #948

* fix: warnings and solves #951  & #948

* fix: warnings and solves #951  & #948

* Fix: UI Redesign

* fix: merge

* fix

* Update AddOnStore.tsx

* Fixed Merge Errors

* Add test: for OrgEntry

* Test 3

* fix test 4

* chores: version changes

* Add: Initial Websocket setup on talawa mobile web

* Add: plugin logic

* Add: plugin logic

* removed extra

* removed extra

* Added: Tests

* fix

* Add Side Navigation to Event Dashboard (#981)

* Create left drawer for event dashboard

* Add basic styles to the event dashboard

* Fix button styling

* Add testing

* Add testing for the left event drawer

* Add 100% line coverage for all components

* Increase timeout for tests

* Move maximum rating in feedback from 10 to 5 [Fixes #990] (#987)

* Move maximum rating in feedbacks from 10 to 5

* Fix failing tests

* Add chat screen to talawa-user-portal (#986)

* Create login and register page for user portal

* Lint public locales

* Create tests for login page components

* Add react import in tests

* Create organizations screen for user portal

* Fix failing tests and lint code

* fix failing tests

* Add tests for organization screen and componenets

* Fix non-null assertions

* Fix non-null assertions in organizations test

* Fix bootstrap migration changes

* Add Home Screen along with other components

* Fix failing tests

* Add required tests and Offcanvas navbar

* Remove unused variables from tests

* Sync the Mutations with talawa-api

* Add Settings and Donate Screen

* Add multilingual support for the screens

* Add events screen without calendar view

* Add multilingual support to Events screen

* Fix failing tests due to merge

* Add Post Comment functionality

* Refactor Events tests

* Deprecate event registrants from query

* Add my tasks screen for user portal

* Remove unnecessary comments from test files

* Add chat screen along with components

* Add mui/system package for x-chart support

* Add chat screen tests and fix other bugs

* Update issue.yml

* Update stale.yml

* Merge latest AdminUI Redesign into Master (#1006)

* Pagination Done for Orglist

* Fixed warnings

* Infinite scroll and search working for Requests screen

* Simplified the code

* Infinite scroll enabled and functioning on OrgList Requests and Users screen

* FIxed warning

* Fixed typo

* Fixed bug

* Joined and Blockedbyorgs screen and mdoal ready

* Tables ready !

* Remove user from organization functionality working well

* Update user role in organization feature ready

* Minor changes

* Done with tests on OrgList

* Done with testss of Requests screen

* 100% CC achieved for Users screen

* Main tests done for UserTableItem

* 100% Code Coverage Achieved for UserTableItem

* Removed Redundant Landing Page

* 100% CC achieved for TableLoader

* Translation added for Users Screen

* Translation done for Requests screen

* Translation done for dashboard screen

* Linting and warnings fixed

* Improved login page

* UI Done for Forgot Password Screen

* Forgot Password Screen Tests done!

* Fixed all pending tests

* Better message for btns and coloring

* Linting issues fixed

* Fixed code styles

* SUPPRESSED UNKNOWN ERROR

* Fixed formatting

* Updated typoed message

* Fixed failing tests accompanying typo

* fix createEvent to close modal and show events without refresh (#1014)

* fix: Ensure Full Visibility of Logo on 404 Error Page (#1018)

- Adjusted the positioning of the logo on the 404 error page to ensure full visibility.
- Implemented CSS modifications to prevent the logo from being covered or cut off.
- Tested the changes by navigating to various undefined endpoints, confirming that the logo is now displayed
  correctly on the 404 error page.

This commit addresses the bug by ensuring the proper display of the logo on the 404 error page,
enhancing the user experience.

Fixes #1016

Signed-off-by: Akhilender <[email protected]>

* Implemented featurs for Postfeed Management (#982)

* redesigned newsfeed

* added test

* newsfeed management

* pinned post

* postfeed management

* pin unpin tag and video control

* changes part 2

* newsfeed changes

* changes in Card Preview of newsfeed

* changes in Card Preview of newsfeed

* testing phase 1

* translation

* tests

* tests

* merged intto develop

* test

* Added query

* Update pull-requests.yml

* update and delete buttons of event modal are now working (#1051)

* update and delete buttons of event modal are now working

* fixed the naming conventions and style of the modal

* Dynamic dashboard Enhancements (#979)

* Dynamic Organization Dashboard

* Dynamic Organization Dashboard

* refined organization dashboard

* Update src/utils/handleLatestFeed.ts

Co-authored-by: Noble Mittal <[email protected]>

* fixed inconsistent casing

* fixed org dashboard test

* fixed org dashboard test

* revert previous commit

* final changes

* final changes

---------

Co-authored-by: Noble Mittal <[email protected]>

* Fix dashboard items (#1007)

* Dashboard items are working now.

* added variables for links -fix dashboard items

* Added variables for links -fix dashboard items.

* made the changes as said

* Removed : string from variable assignment.

* remove repititive code and resolved falling tests

* Fix repeating code and falling tests.

* Resolved some more falling tests

* write test for missed lines

* Fix event creation issue with white spaces. (#1025)

* fix event creation with white spaces

* Add test for empty input values

* chore: fix unit test (#1052)

* Fix layout distortion due to untruncated title description of events. (#1049)

* Fix layout distortion due to untruncated title description of events

* Add test

* add test for LeftDrawerEvent.tsx

* fixed some tests

* add test complete

* test: SecuredRouteForUser component 100% Test Coverage and fixed uncovered lines (#1048)

* SecuredRouteForUser test case added

* Fixed Linting Errors

* Update SecuredRouteForUser.test.tsx

* Update SecuredRouteForUser.test.tsx

* linting fix

* Update SecuredRouteForUser.test.tsx

* Update SecuredRouteForUser.test.tsx

* Fix incorrect toast Notification. (#1053)

* correct toast notification for TableRow.tsx with full test coverage

* Add correct toast with full code  coverage

* Add correct toast for deleteEventProjectModal.tsx with full test coverage

* Add correct toast for UpdateEventProjectModal.tsx with full test coverage

* Add correct toast for EventRegistrantsModal.tsx and full test  coverage.

* Add correct toast for AddTaskModal.tsx with full test coverage

* Add correct toast for UpdateTaskModal.tsx with full test coverage

* minor fix

* Add correct toast to EventRegistrantsModal.tsx

* fix EventRegitrantsModal.tsx

* created a return button on event dashboard (#1057)

* test: Loader Component 100% Test Coverage and Fix Uncovered Lines (#1047)

* test: Achieve 100% Test Coverage and Fix Uncovered Lines

- Improved the test coverage for the Loader component, addressing the previously uncovered lines and ensuring that all tests pass successfully.
- Added a test to ensure that the component renders correctly with a custom 'sm' size. I verified that both the spinner-wrapper and
  spinner elements are present and that the correct class is applied.
- Added a test to ensure that the component renders correctly with a 'lg' size. I verified that the spinner element has the appropriate class.
- Added a test to ensure that the component renders correctly with an 'xl' size. I verified that the spinner element has the correct class.

With these new tests, I now have 100% test coverage, and there are no more uncovered lines. The Loader component is thoroughly tested for
different size scenarios, and all tests pass successfully.

Signed-off-by: Akhilender <[email protected]>

* Fixed linting in Loader component

Signed-off-by: Akhilender <[email protected]>

* Test: Increasing the test level

- Trying to meet the code coverage level for Loader component.

Signed-off-by: Akhilender <[email protected]>

* Fixed Linting

Signed-off-by: Akhilender <[email protected]>

* fix: Linting

Signed-off-by: Akhilender <[email protected]>

* Improving test coverage for Loader Component

- Fixed lint errors

Signed-off-by: Akhilender <[email protected]>

* test: Improving the tests on the Loader Component

- Added a new aspect in the test-case1

Signed-off-by: Akhilender <[email protected]>

* Fixed: Removed runtime-generated classes from testing

- Eliminated all checks for classes associated with bootstrap components assigned at runtime.
- Recognized that validating classes assigned during runtime is inappropriate.

Signed-off-by: Akhilender <[email protected]>

---------

Signed-off-by: Akhilender <[email protected]>

* Simulated Test Database (#984)

* Dynamic Organization Dashboard

* Dynamic Organization Dashboard

* Sample Org Implementation

* removed unnecessary changes

* removed unnecessary svgs

* removed unnecessary import

* added appropriate button style

* fixed OrgListCard tests

* Fixed OrgList and OrgListCard Tests

* Removed Unnecessary 'container' Variable

* Added Missing Translations and removed unused variable

* Fixed event check in management not updating automatically bug (#1062)

* fixed the event checkIn bug

* fixed the failing test

* fixed the CheckInWrapper test

* Fix user profile buttons layout and added form validation (#1064)

* Fix user profile buttons layout and added form validation

* Fix falling tests and warnings

* Add test for missed lines

* fix falling tests

* test: Achieved 100% test coverage and fixed uncovered lines (#1068)

* test: Achieved 100% test coverage and fixed uncovered lines

- Improved the test coverage for the User-Password-Update component, addressing the previously uncovered lines and ensuring that all tests pass
  successfully.
- Added two new tests
  1. Empty Password Field Test:
   - The first test ensures that an error is displayed when attempting to save changes with an empty password field.

  2. Mismatched New and Confirm Passwords Test
   - The second test covers the scenario where the new and confirm password fields do not match.

With these new tests, I now have 100% test coverage, and there are no more uncovered lines.

Signed-off-by: Akhilender <[email protected]>

* Altered the formData

- Altered the formData to make sure all are related to the organization name.

Signed-off-by: Akhilender <[email protected]>

---------

Signed-off-by: Akhilender <[email protected]>

* created test for src/components/UserPortal/EventCard/EventCard.tsx (#1079)

* created test for eventCard of User portal

* corrected the start and end time

* Feature request: Adding advertisement screen (#994)

* Add/ test for OrgPost.tsx

* fix:  org post back to default

* Added Dialog 2

* Updated Dialog UI

* Removed Extra code

* Updated Plugin store

* fix: warnings and solves #951  & #948

* fix: warnings and solves #951  & #948

* fix: warnings and solve…
…ations" button (PalisadoesFoundation#1124)

* Changes position and text of all organization button

* Made changes to the routesReducer.test file

* Made changes in IconComponent.test file

* Fetched changes from main repo

* Fixed unnecessary changes

---------

Co-authored-by: Aditya Agarwal <[email protected]>
* Added Base branch check to main

* Deleted all files in the main branch in anticipation of merging develop into main cleanly

* Merge develop to main

* Deleted all main files

* Merged develop into main
* Deleted all files in the main branch in anticipation of merging develop into main cleanly

* Merge develop into main
* Deleted all files in the main branch in anticipation of merging develop into main cleanly

* Merge develop into main

* Deleted all files in the main branch in anticipation of merging develop into main cleanly

* Merge develop into main
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.5 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](follow-redirects/follow-redirects@v1.15.5...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [tar](https://github.com/isaacs/node-tar) from 6.1.15 to 6.2.1.
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](isaacs/node-tar@v6.1.15...v6.2.1)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…lisadoesFoundation#1961)

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 40 to 41.
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](tj-actions/changed-files@v40...v41)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](expressjs/express@4.18.2...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [ejs](https://github.com/mde/ejs) from 3.1.9 to 3.1.10.
- [Release notes](https://github.com/mde/ejs/releases)
- [Commits](mde/ejs@v3.1.9...v3.1.10)

---
updated-dependencies:
- dependency-name: ejs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…tion#2020)

* Deleted all files in the main branch in anticipation of merging develop into main cleanly

* Merge develop into main

---------

Co-authored-by: Peter Harrison <[email protected]>
* 20240727112607 Deleted all files in the main branch in anticipation of merging develop into main cleanly

* 20240727112842 Merge develop into main
* 20240929102850 Deleted all files in the main branch in anticipation of merging develop into main cleanly

* 20240929103238 Merge develop into main
…lisadoesFoundation#2307)

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 40 to 41.
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](tj-actions/changed-files@v40...v41)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot bot and others added 2 commits September 29, 2024 11:32
Bumps [rollup](https://github.com/rollup/rollup) from 4.21.3 to 4.22.5.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](rollup/rollup@v4.21.3...v4.22.5)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Copy link
Contributor

coderabbitai bot commented Dec 19, 2024

Walkthrough

This pull request introduces a comprehensive migration from Jest to Vitest for testing in the Talawa Admin project. The changes span multiple files, including configuration files like jest.config.js, tsconfig.json, and package.json, as well as numerous test files across different components and screens. The primary focus is on updating test assertions, mocking frameworks, and testing configurations to align with Vitest's syntax and features.

Changes

File Change Summary
.husky/pre-commit Commented out formatting and linting commands, kept npm test
jest.config.js Updated coverage collection and test matching configurations
package.json Updated dependencies, added Vitest-related scripts and dependencies
tsconfig.json Added exclude property for compilation
vitest.config.ts New configuration file for Vitest testing framework
Multiple test files Replaced toBeCalledWith with toHaveBeenCalledWith for toast notifications

Possibly related issues

Possibly related PRs

Poem

🐰 Hop, hop, testing we go!
From Jest to Vitest, watch our code flow
Assertions sharp, mocks precise
Our tests now dance with Vitest's might
Quality code, our rabbit's delight! 🧪


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

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Congratulations on making your first PR! 🎊 If you haven't already, check out our Contributing Guidelines and PR Reporting Guidelines to ensure that you are following our guidelines for contributing and creating PR.

@varshith257 varshith257 changed the base branch from main to develop-postgres December 19, 2024 16:51
@varshith257
Copy link
Member

varshith257 commented Dec 19, 2024

@khushipatil1523 I think it's your first contribution here. Welcome!

We don't accept PRs against main branch. You need to upstream your local branch with develop-postgres branch and submit PR against it. If you need any help feel free to reach out to Community in Slack.

You can follow this

> git remote add upstream https://github.com/PalisadoesFoundation/talawa-admin.git

> git fetch upstream

> git checkout -b refactor/test-jest-to-vitest-2486 upstream/develop-postgres

Now make changes in this branch and submit a new PR
Closing

@varshith257 varshith257 removed the request for review from palisadoes December 19, 2024 16:57
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: 6

🔭 Outside diff range comments (19)
src/components/UserPortal/StartPostModal/StartPostModal.test.tsx (1)

Uncomment and update the success toast assertion to match implementation

The implementation shows that a success toast is displayed with the translation key 'postNowVisibleInFeed', but the test has a commented assertion with a hardcoded message. The test should be updated to assert the translated message.

  • Update test assertion in src/components/UserPortal/StartPostModal/StartPostModal.test.tsx to:
expect(toast.success).toHaveBeenCalledWith(t('postNowVisibleInFeed'));
🔗 Analysis chain

Line range hint 153-156: Consider uncommenting success toast assertion

There's a commented-out success toast assertion. Consider either removing it completely or uncommenting and fixing it if it's needed for complete test coverage.


Let me gather more context about the specific test file to understand the toast usage pattern.


Let me check the implementation file to see if there's any success toast being shown after post creation.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check if success toasts are tested in other files
rg "toast.success.*toHaveBeenCalledWith" -A 2

Length of output: 14521


Script:

#!/bin/bash
# Check the test file content around the commented toast assertion
rg -B 5 -A 5 "Your post is now visible in the feed" src/components/UserPortal/StartPostModal/StartPostModal.test.tsx

# Check the implementation file to see if there's a success toast being shown
rg "toast.success.*visible.*feed" src/components/UserPortal/StartPostModal/StartPostModal.tsx

Length of output: 562


Script:

#!/bin/bash
# Check the implementation file for any success toast after post creation
rg "toast\." -A 2 src/components/UserPortal/StartPostModal/StartPostModal.tsx

Length of output: 310

src/components/OrgSettings/AgendaItemCategories/OrganizationAgendaCategory.test.tsx (2)

Line range hint 1-14: Update Jest imports and configurations for Vitest

The file still uses Jest-specific imports and configurations. For complete migration to Vitest:

-import 'jest-localstorage-mock';
-import 'jest-location-mock';
+import { beforeEach, afterEach, describe, expect, test, vi } from 'vitest';

Line range hint 27-33: Replace Jest mock with Vitest mock

Update the mock implementation to use Vitest's mocking system:

-jest.mock('react-toastify', () => ({
+vi.mock('react-toastify', () => ({
  toast: {
-    success: jest.fn(),
-    error: jest.fn(),
+    success: vi.fn(),
+    error: vi.fn(),
  },
}));
src/screens/OrganizationTags/OrganizationTags.test.tsx (1)

Line range hint 44-50: Update Jest mock with Vitest mock

Update the mock implementation:

-jest.mock('react-toastify', () => ({
+vi.mock('react-toastify', () => ({
  toast: {
-    success: jest.fn(),
-    error: jest.fn(),
+    success: vi.fn(),
+    error: vi.fn(),
  },
}));
src/components/UserPortal/Register/Register.test.tsx (1)

Line range hint 52-58: Update Jest mock with Vitest mock

Update the mock implementation:

-jest.mock('react-toastify', () => ({
+vi.mock('react-toastify', () => ({
  toast: {
-    success: jest.fn(),
-    warn: jest.fn(),
-    error: jest.fn(),
+    success: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
  },
}));
src/screens/ManageTag/ManageTag.test.tsx (1)

Line range hint 1-295: Complete the Jest to Vitest migration

While the toast assertion has been updated, there are several Jest-specific patterns that should be migrated to Vitest:

Apply these changes for complete migration:

-import 'jest-location-mock';
+import 'vitest-location-mock';

-jest.mock('react-toastify', () => ({
+vi.mock('react-toastify', () => ({
   toast: {
-    success: jest.fn(),
-    error: jest.fn(),
+    success: vi.fn(),
+    error: vi.fn(),
   },
 }));

 beforeEach(() => {
-  jest.mock('react-router-dom', () => ({
-    ...jest.requireActual('react-router-dom'),
+  vi.mock('react-router-dom', () => ({
+    ...vi.importActual('react-router-dom'),
     useParams: () => ({ orgId: 'orgId' }),
   }));
 });

 afterEach(() => {
-  jest.clearAllMocks();
+  vi.clearAllMocks();
 });
src/screens/SubTags/SubTags.test.tsx (1)

Line range hint 1-326: Migrate remaining Jest patterns to Vitest

Similar to ManageTag.test.tsx, this file needs complete migration to Vitest patterns.

Apply these changes:

-import 'jest-location-mock';
+import 'vitest-location-mock';

-jest.mock('react-toastify', () => ({
+vi.mock('react-toastify', () => ({
   toast: {
-    success: jest.fn(),
-    error: jest.fn(),
+    success: vi.fn(),
+    error: vi.fn(),
   },
 }));

 beforeEach(() => {
-  jest.mock('react-router-dom', () => ({
-    ...jest.requireActual('react-router-dom'),
+  vi.mock('react-router-dom', () => ({
+    ...vi.importActual('react-router-dom'),
     useParams: () => ({ orgId: 'orgId' }),
   }));
 });

 afterEach(() => {
-  jest.clearAllMocks();
+  vi.clearAllMocks();
 });
src/components/AgendaCategory/AgendaCategoryContainer.test.tsx (1)

Update test configuration and mocks for Vitest environment

The test file needs to be updated to align with Vitest's configuration and mocking patterns. Based on the setup files, the project is currently using Jest but has a Vitest configuration in place.

  • Replace jest-localstorage-mock with the built-in Vitest DOM environment which includes localStorage
  • Update the mock syntax from jest.mock to vi.mock
  • Update the test timeout from jest.setTimeout to vi.setConfig({ testTimeout: 15000 })
  • Remove jest-location-mock as the jsdom environment in Vitest provides location object
-import 'jest-localstorage-mock';
-import 'jest-location-mock';

-jest.mock('react-toastify', () => ({
+vi.mock('react-toastify', () => ({
   toast: {
-    success: jest.fn(),
-    error: jest.fn(),
+    success: vi.fn(),
+    error: vi.fn(),
   },
 }));
🔗 Analysis chain

Line range hint 1-369: Migrate Jest patterns and update localStorage mock for Vitest

The file needs complete migration to Vitest patterns, including the localStorage mock.

Apply these changes:

-import 'jest-localstorage-mock';
+import 'vitest-localstorage-mock';
-import 'jest-location-mock';
+import 'vitest-location-mock';

-jest.mock('react-toastify', () => ({
+vi.mock('react-toastify', () => ({
   toast: {
-    success: jest.fn(),
-    error: jest.fn(),
+    success: vi.fn(),
+    error: vi.fn(),
   },
 }));

 async function wait(ms = 100): Promise<void> {
   await act(async () => {
     return new Promise((resolve) => setTimeout(resolve, ms));
   });
 }

Run this script to check if the vitest-localstorage-mock package is available:


Let me check if there are any existing test setup files or configurations that might help us understand the testing environment better.


Let me check the content of the test setup files and vitest configuration to understand the current testing environment setup.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check if vitest-localstorage-mock is listed in package.json
rg -l "vitest-localstorage-mock" package.json || echo "Package not found in dependencies"

Length of output: 122


Script:

#!/bin/bash
# Look for test setup files and vitest configuration
fd -e ts -e js -e json "vitest.config|test.setup|setupTests" 

# Check package.json for testing-related dependencies
rg "devDependencies|dependencies" package.json -A 10

Length of output: 977


Script:

#!/bin/bash
# Check content of setup files
echo "=== setupTests.ts ==="
cat src/setupTests.ts

echo -e "\n=== vitest.config.ts ==="
cat vitest.config.ts

Length of output: 1979

src/components/AgendaItems/AgendaItemsContainer.test.tsx (1)

Line range hint 285-285: Uncomment and update the toast assertion

The commented assertion should be uncommented and updated to use toHaveBeenCalledWith for consistency with other toast assertions in the file.

Apply this change:

-    // expect(toast.success).toBeCalledWith(translations.agendaItemUpdated);
+    expect(toast.success).toHaveBeenCalledWith(translations.agendaItemUpdated);
src/components/RecurrenceOptions/RecurrenceOptions.test.tsx (2)

Line range hint 1-11: Complete the Jest to Vitest migration for imports and testing utilities.

The test file still uses Jest-specific imports and testing utilities. For a complete migration to Vitest:

Apply these changes to use Vitest equivalents:

-import { MockedProvider } from '@apollo/react-testing';
+import { MockedProvider } from '@apollo/client/testing';
-import { act, render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
-import 'jest-location-mock';
+import { beforeEach, describe, expect, test, vi } from 'vitest';

Line range hint 26-33: Update the mock implementation to use Vitest's mocking system.

The test uses Jest's mocking syntax which should be updated to Vitest's equivalent.

Apply this change:

-jest.mock('react-toastify', () => ({
+vi.mock('react-toastify', () => ({
   toast: {
-    success: jest.fn(),
-    warning: jest.fn(),
-    error: jest.fn(),
+    success: vi.fn(),
+    warning: vi.fn(),
+    error: vi.fn(),
   },
 }));
src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.test.tsx (2)

Line range hint 1-19: Complete the Jest to Vitest migration for testing framework imports.

The test file needs to be updated to use Vitest-specific imports and testing utilities.

Apply these changes:

-import React, { act } from 'react';
+import React from 'react';
-import { MockedProvider } from '@apollo/react-testing';
+import { MockedProvider } from '@apollo/client/testing';
+import { beforeEach, describe, expect, test, vi } from 'vitest';

Line range hint 26-34: Update mock implementation to use Vitest's mocking system.

The test uses Jest's mocking syntax which should be updated to Vitest's equivalent.

Apply this change:

-jest.mock('react-toastify', () => ({
+vi.mock('react-toastify', () => ({
   toast: {
-    success: jest.fn(),
-    warning: jest.fn(),
-    error: jest.fn(),
+    success: vi.fn(),
+    warning: vi.fn(),
+    error: vi.fn(),
   },
 }));
src/components/UserPortal/PostCard/PostCard.test.tsx (2)

Line range hint 1-11: Complete the Jest to Vitest migration for testing framework imports.

The test file needs to be updated to use Vitest-specific imports and testing utilities.

Apply these changes:

-import React, { act } from 'react';
+import React from 'react';
-import { MockedProvider } from '@apollo/react-testing';
+import { MockedProvider } from '@apollo/client/testing';
+import { beforeEach, describe, expect, test, vi } from 'vitest';

Line range hint 23-31: Update mock implementation to use Vitest's mocking system.

The test uses Jest's mocking syntax which should be updated to Vitest's equivalent.

Apply this change:

-jest.mock('react-toastify', () => ({
+vi.mock('react-toastify', () => ({
   toast: {
-    error: jest.fn(),
-    info: jest.fn(),
-    success: jest.fn(),
+    error: vi.fn(),
+    info: vi.fn(),
+    success: vi.fn(),
   },
 }));
src/components/AddOn/core/AddOnRegister/AddOnRegister.test.tsx (2)

Line range hint 1-1: Migration needed: Replace Jest mocking with Vitest

The test file still uses Jest's mocking system. For Vitest migration, replace jest.mock() with Vitest's vi.mock():

- jest.mock('react-toastify', () => ({
+ vi.mock('react-toastify', () => ({
  toast: {
-   success: jest.fn(),
+   success: vi.fn(),
  },
}));

- const mockNavigate = jest.fn();
+ const mockNavigate = vi.fn();

Also applies to: 76-77


Line range hint 182-196: Improve test reliability: Avoid fixed timeouts

The test waits for 3 seconds which makes the test suite slow and potentially flaky. Instead of using a fixed timeout, consider using waitFor to check for the actual condition:

- await wait(3000); // Waiting for 3 seconds to reload the page
- expect(mockNavigate).toHaveBeenCalledWith(0);
+ await waitFor(() => {
+   expect(mockNavigate).toHaveBeenCalledWith(0);
+ }, {
+   timeout: 3000
+ });
src/screens/OrganizationDashboard/OrganizationDashboard.test.tsx (2)

Line range hint 3-3: Migration needed: Update test setup for Vitest

Replace Jest-specific mocks with Vitest equivalents:

- import 'jest-location-mock';
+ import { beforeEach, afterEach, vi } from 'vitest';

- jest.mock('react-toastify', () => ({
+ vi.mock('react-toastify', () => ({
  toast: {
-   success: jest.fn(),
-   warn: jest.fn(),
-   error: jest.fn(),
+   success: vi.fn(),
+   warn: vi.fn(),
+   error: vi.fn(),
  },
}));

Also applies to: 31-41


Line range hint 179-199: Improve test isolation: Avoid modifying React internals

The current approach of mocking React's useState directly could lead to unexpected behavior. Consider refactoring to test the component's behavior rather than its implementation details:

test('event data should update correctly', async () => {
  mockId = '123';
  render(
    <MockedProvider addTypename={false} link={link1}>
      <BrowserRouter>
        <Provider store={store}>
          <I18nextProvider i18n={i18nForTest}>
            <OrganizationDashboard />
          </I18nextProvider>
        </Provider>
      </BrowserRouter>
    </MockedProvider>
  );
  
  // Wait for initial render
  await waitFor(() => {
    expect(screen.getByTestId('cardItem')).toBeInTheDocument();
  });
  
  // Trigger event update
  // Assert updated UI
});
🧹 Nitpick comments (11)
vitest.config.ts (1)

16-17: Consider adding additional test environment setup.

While the basic environment is configured, you might want to add setup files for common test utilities and mocks.

     globals: true,
     environment: 'jsdom',
+    setupFiles: ['./src/test/setup.ts'],
+    environmentOptions: {
+      jsdom: {
+        resources: 'usable',
+      },
+    },
jest.config.js (1)

80-81: Fix formatting issues in coverage configuration

The coverage configuration has formatting issues that need to be addressed.

-  coverageDirectory:'./coverage/jest',
-  coverageReporters:['text','html','text-summary','lcov'],
+  coverageDirectory: './coverage/jest',
+  coverageReporters: ['text', 'html', 'text-summary', 'lcov'],
🧰 Tools
🪛 eslint

[error] 80-80: Insert ·

(prettier/prettier)


[error] 81-81: Replace ['text','html','text-summary', with ·['text',·'html',·'text-summary',·

(prettier/prettier)

src/components/UserPortal/StartPostModal/StartPostModal.test.tsx (1)

147-150: Consider removing redundant empty assertion

The test includes a redundant assertion not.toHaveBeenCalledWith() without parameters. Consider removing it as the subsequent assertion adequately tests the toast behavior.

-    expect(toast.error).not.toHaveBeenCalledWith();
     expect(toast.info).toHaveBeenCalledWith(
       'Processing your post. Please wait.',
     );
src/components/OrgSettings/AgendaItemCategories/OrganizationAgendaCategory.test.tsx (1)

Line range hint 193-236: Uncomment and implement the error test case

The commented-out test case for error handling should be implemented to ensure complete test coverage. This is particularly important for error scenarios.

Would you like me to help implement this test case with the correct Vitest syntax?

src/components/AgendaCategory/AgendaCategoryContainer.test.tsx (1)

Line range hint 1-1: Consider a systematic approach for Jest to Vitest migration

While the toast assertions have been updated to use toHaveBeenCalledWith, there are several other Jest-specific patterns that need migration across multiple files. Consider:

  1. Creating a migration guide for the team
  2. Using codemods or scripts to automate the migration
  3. Updating test utilities and mock files consistently

Key patterns to migrate project-wide:

  • Replace jest.fn() with vi.fn()
  • Replace jest.mock() with vi.mock()
  • Replace jest.clearAllMocks() with vi.clearAllMocks()
  • Update mock imports (e.g., jest-location-mock to vitest-location-mock)
  • Replace jest.requireActual() with vi.importActual()

Would you like me to help create a migration guide or codemod script for these changes?

src/screens/UserPortal/Events/Events.test.tsx (1)

339-341: Consider using translations for toast messages

While the toast assertions have been correctly updated to use toHaveBeenCalledWith, the success message is hardcoded. Consider using translations for consistency with other components.

Example refactor:

-    expect(toast.success).toHaveBeenCalledWith(
-      'Event created and posted successfully.',
-    );
+    expect(toast.success).toHaveBeenCalledWith(translations.eventCreated);

Also applies to: 382-384

src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.test.tsx (1)

252-252: Assertion method changes are correct but need consistent formatting.

The changes to use toHaveBeenCalledWith are correct, but the formatting varies across assertions. Some use multiple lines while others are single-line.

Consider consistent formatting for all assertions:

-expect(toast.success).toHaveBeenCalledWith('Advertisement created successfully.');
+expect(toast.success).toHaveBeenCalledWith(
+  'Advertisement created successfully.'
+);

Also applies to: 343-343, 468-468, 595-595

src/components/UserPortal/PostCard/PostCard.test.tsx (1)

341-341: Assertion method changes are correct but need consistent formatting.

The changes to use toHaveBeenCalledWith are correct, but the formatting is inconsistent between single-line and multi-line assertions.

Consider using consistent multi-line formatting for all toast assertions for better readability:

-expect(toast.success).toHaveBeenCalledWith('Post updated Successfully');
+expect(toast.success).toHaveBeenCalledWith(
+  'Post updated Successfully'
+);

Also applies to: 391-393

src/components/UsersTableItem/UserTableItem.test.tsx (1)

Line range hint 1-1200: Consider organizing tests using describe blocks for better structure.

The test file has good coverage but could benefit from better organization. Consider grouping related tests under descriptive describe blocks for better readability and maintenance.

Example structure:

 describe('Testing User Table Item', () => {
+  describe('Basic Rendering', () => {
     test('Should render props and text elements test for the page component', async () => {
       // ... existing test
     });
+  });
+
+  describe('Modal Functionality', () => {
     test('Should render elements correctly when JoinedOrgs and BlockedByOrgs are empty', async () => {
       // ... existing test
     });
+  });
+
+  describe('User Management', () => {
     test('Remove user from Organization should function properly', async () => {
       // ... existing test
     });
+  });
 });
src/components/AddOn/core/AddOnRegister/AddOnRegister.test.tsx (1)

Line range hint 45-71: Simplify test setup: Extract common test configuration

Multiple test cases share similar setup code. Consider extracting the common setup into a helper function:

function renderAddOnRegister(props: any, mocks: any[] = []) {
  return render(
    <MockedProvider addTypename={false} mocks={mocks}>
      <BrowserRouter>
        <Provider store={store}>
          <I18nextProvider i18n={i18nForTest}>
            <AddOnRegister {...props} />
          </I18nextProvider>
        </Provider>
      </BrowserRouter>
    </MockedProvider>
  );
}
src/screens/OrganizationDashboard/OrganizationDashboard.test.tsx (1)

Line range hint 44-48: Improve test maintainability: Use test lifecycle hooks properly

The beforeEach hook modifies localStorage directly. Consider using Vitest's beforeEach for better test isolation and cleanup:

beforeEach(() => {
  vi.stubGlobal('localStorage', {
    setItem: vi.fn(),
    getItem: vi.fn(),
    clear: vi.fn()
  });
  
  // Set required items
  localStorage.setItem('FirstName', 'John');
  localStorage.setItem('LastName', 'Doe');
  localStorage.setItem(
    'UserImage',
    'https://api.dicebear.com/5.x/initials/svg?seed=John%20Doe'
  );
});
📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 3d1f1f0 and 2958074.

⛔ Files ignored due to path filters (1)
  • package-lock.json is excluded by !**/package-lock.json
📒 Files selected for processing (25)
  • .husky/pre-commit (1 hunks)
  • jest.config.js (3 hunks)
  • package.json (6 hunks)
  • src/components/AddOn/core/AddOnRegister/AddOnRegister.test.tsx (1 hunks)
  • src/components/Advertisements/Advertisements.spec.tsx (3 hunks)
  • src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.test.tsx (4 hunks)
  • src/components/AgendaCategory/AgendaCategoryContainer.test.tsx (2 hunks)
  • src/components/AgendaItems/AgendaItemsContainer.test.tsx (1 hunks)
  • src/components/EventListCard/EventListCard.test.tsx (8 hunks)
  • src/components/OrgSettings/AgendaItemCategories/OrganizationAgendaCategory.test.tsx (1 hunks)
  • src/components/RecurrenceOptions/CustomRecurrence.test.tsx (2 hunks)
  • src/components/RecurrenceOptions/RecurrenceOptions.test.tsx (2 hunks)
  • src/components/TableLoader/TableLoader.test.tsx (1 hunks)
  • src/components/UserPortal/PostCard/PostCard.test.tsx (2 hunks)
  • src/components/UserPortal/Register/Register.test.tsx (7 hunks)
  • src/components/UserPortal/StartPostModal/StartPostModal.test.tsx (2 hunks)
  • src/components/UsersTableItem/UserTableItem.test.tsx (3 hunks)
  • src/screens/ManageTag/ManageTag.test.tsx (1 hunks)
  • src/screens/OrganizationDashboard/OrganizationDashboard.test.tsx (1 hunks)
  • src/screens/OrganizationEvents/OrganizationEvents.test.tsx (3 hunks)
  • src/screens/OrganizationTags/OrganizationTags.test.tsx (2 hunks)
  • src/screens/SubTags/SubTags.test.tsx (2 hunks)
  • src/screens/UserPortal/Events/Events.test.tsx (2 hunks)
  • tsconfig.json (1 hunks)
  • vitest.config.ts (1 hunks)
🧰 Additional context used
📓 Learnings (2)
src/components/Advertisements/Advertisements.spec.tsx (1)
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/OrganizationTags/OrganizationTags.test.tsx (1)
Learnt from: meetulr
PR: PalisadoesFoundation/talawa-admin#2398
File: src/screens/OrganizationTags/OrganizationTags.test.tsx:184-0
Timestamp: 2024-11-12T10:40:58.655Z
Learning: In the `talawa-admin` project, it's acceptable for test cases in `src/screens/OrganizationTags/OrganizationTags.test.tsx` to test multiple behaviors within a single test function without needing to split them into smaller, focused tests.
🪛 eslint
src/components/Advertisements/Advertisements.spec.tsx

[error] 72-72: import() type annotations are forbidden.

(@typescript-eslint/consistent-type-imports)

vitest.config.ts

[error] 1-1: Definition for rule '@typescript-eslint/ban-types' was not found.

(@typescript-eslint/ban-types)

jest.config.js

[error] 13-13: Insert ⏎··

(prettier/prettier)


[error] 80-80: Insert ·

(prettier/prettier)


[error] 81-81: Replace ['text','html','text-summary', with ·['text',·'html',·'text-summary',·

(prettier/prettier)

🪛 Biome (1.9.4)
package.json

[error] 70-70: The key test:vitest was already declared.

This where a duplicated key was declared again.

If a key is defined multiple times, only the last definition takes effect. Previous definitions are ignored.

(lint/suspicious/noDuplicateObjectKeys)

🔇 Additional comments (19)
tsconfig.json (1)

21-22: LGTM!

The TypeScript configuration changes appropriately exclude build artifacts and the Vitest configuration file. The includes and compiler options are well-configured for the Vitest environment.

vitest.config.ts (2)

18-33: LGTM! Comprehensive coverage configuration.

The coverage configuration is well-structured with:

  • Appropriate provider and output directory
  • Comprehensive exclusion patterns
  • Multiple report formats including HTML and LCOV

9-11: Verify if additional node polyfills are needed.

The configuration only includes the 'events' polyfill. Depending on your codebase, you might need additional Node.js built-in modules.

✅ Verification successful

The 'events' polyfill is sufficient for the current codebase

The codebase scan shows that only the following Node.js built-in modules are used:

  • fs (in setup and test files)
  • path (in git hooks)
  • util (in test setup)

These files are either test files or development scripts that don't need polyfills in the browser environment. The current configuration with only the 'events' polyfill is appropriate as it's likely needed by some of the runtime dependencies.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for Node.js built-in module usage in test files
rg -t ts -t tsx -t js -t jsx "require\(['\"](?:fs|path|crypto|buffer|stream|util)" src/

Length of output: 119


Script:

#!/bin/bash
# Search for Node.js built-in module usage with ripgrep, fixing file type flags
rg -t typescript -t javascript "require\(['\"](?:fs|path|crypto|buffer|stream|util)" .

# Also search for ES6 import syntax
rg -t typescript -t javascript "from ['\"](?:fs|path|crypto|buffer|stream|util)['\"]" .

# Search specifically for events module usage to understand why it's included
rg -t typescript -t javascript "(?:require\(['\"]events['\"]|from ['\"]events['\"])" .

Length of output: 386


Script:

#!/bin/bash
# Search for Node.js built-in module usage without file type flags
rg "(?:require\(['\"]|from ['\""])(?:fs|path|crypto|buffer|stream|util|events)['\"]" .

# Look for package.json to check dependencies that might need node polyfills
fd "package.json" -x cat {}

Length of output: 269


Script:

#!/bin/bash
# Search for Node.js built-in module usage with simpler patterns
rg "from ['\"]events['\"]" .
rg "from ['\"]fs['\"]" .
rg "from ['\"]path['\"]" .
rg "from ['\"]crypto['\"]" .
rg "from ['\"]buffer['\"]" .
rg "from ['\"]stream['\"]" .
rg "from ['\"]util['\"]" .

# Check package.json for dependencies
cat package.json

Length of output: 6481

src/components/TableLoader/TableLoader.test.tsx (1)

76-76: LGTM: Assertion updated to align with Vitest's preferred syntax

The change from toThrowError() to toThrow() is correct and follows Vitest's recommended assertion style.

jest.config.js (1)

3-13: LGTM: Coverage exclusions are well-defined

The coverage exclusions are appropriate, excluding test files, build artifacts, and type definitions.

🧰 Tools
🪛 eslint

[error] 13-13: Insert ⏎··

(prettier/prettier)

src/components/UserPortal/StartPostModal/StartPostModal.test.tsx (1)

132-134: LGTM: Toast error assertion updated to preferred syntax

The change from toBeCalledWith to toHaveBeenCalledWith follows the recommended assertion syntax.

src/components/OrgSettings/AgendaItemCategories/OrganizationAgendaCategory.test.tsx (1)

188-190: LGTM: Toast assertion updated correctly

The update to use toHaveBeenCalledWith is correct and aligns with Vitest's preferred syntax.

src/screens/OrganizationTags/OrganizationTags.test.tsx (1)

226-228: LGTM: Toast assertions updated correctly

The updates to use toHaveBeenCalledWith are correct and consistent with Vitest's syntax.

Also applies to: 245-247

src/components/UserPortal/Register/Register.test.tsx (1)

107-107: LGTM: Toast assertions updated consistently

All toast assertions have been correctly updated to use toHaveBeenCalledWith, maintaining consistency throughout the test suite.

Also applies to: 127-127, 148-148, 172-172, 198-198, 226-228, 263-265

src/components/AgendaItems/AgendaItemsContainer.test.tsx (1)

374-376: LGTM: Toast assertion updated correctly

The update to use toHaveBeenCalledWith aligns with Vitest's preferred assertion syntax.

src/screens/OrganizationEvents/OrganizationEvents.test.tsx (1)

285-285: LGTM: Toast assertions consistently updated

All toast assertions have been properly updated to use toHaveBeenCalledWith, maintaining consistency across the test suite.

Also applies to: 374-376, 455-455

src/components/RecurrenceOptions/RecurrenceOptions.test.tsx (1)

456-456: Assertion method changes align with modern testing practices.

The change from toBeCalledWith to toHaveBeenCalledWith is correct and follows modern testing best practices. This change improves readability and is the preferred method in both Jest and Vitest.

Also applies to: 578-578

src/components/Advertisements/Advertisements.spec.tsx (2)

3-3: LGTM: Vitest imports added correctly

The import of Vitest testing utilities has been properly added.


56-62: LGTM: Plugin helper mock updated to use Vitest syntax

The mock implementation has been correctly updated to use Vitest's vi instead of Jest's jest.

src/components/RecurrenceOptions/CustomRecurrence.test.tsx (1)

584-584: LGTM: Toast assertions updated to Vitest syntax

The toast assertions have been correctly updated from Jest's toBeCalledWith to Vitest's toHaveBeenCalledWith.

Also applies to: 712-712

src/components/EventListCard/EventListCard.test.tsx (1)

365-365: LGTM: Toast assertions consistently updated throughout the file

All toast assertions have been properly updated from Jest's toBeCalledWith to Vitest's toHaveBeenCalledWith, maintaining consistency across test cases.

Also applies to: 418-418, 462-462, 699-699, 765-765, 826-826, 866-866, 924-924

src/components/UsersTableItem/UserTableItem.test.tsx (2)

502-502: LGTM! Assertion method updates improve readability.

The change from toBeCalledWith to toHaveBeenCalledWith is a good improvement as it makes the assertions more readable and aligns with Vitest's preferred syntax.

Also applies to: 506-507


696-696: LGTM! Consistent assertion updates.

The changes maintain consistency with the updated assertion style throughout the test suite.

Also applies to: 723-724

src/screens/OrganizationDashboard/OrganizationDashboard.test.tsx (1)

Line range hint 1-200: Verify test framework configuration

Ensure that the Vitest configuration properly handles the test environment setup, including DOM simulation and module mocking.

#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npm test
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Consider maintaining comprehensive pre-commit checks.

The pre-commit hook has been simplified to only run tests, removing important checks like formatting, linting, and type checking. While this simplifies the pre-commit process, it might lead to inconsistent code quality.

Consider restoring these essential checks:

#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

+npm run format:fix
+npm run lint:fix
+npm run typecheck
npm test
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
npm test
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"
npm run format:fix
npm run lint:fix
npm run typecheck
npm test

tsconfigPaths(),
],
test: {
include: ['src/**/*.spec.{js,jsx,ts,tsx}'],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Consider broadening test file pattern.

The current pattern src/**/*.spec.{js,jsx,ts,tsx} might miss test files using .test. naming convention.

-    include: ['src/**/*.spec.{js,jsx,ts,tsx}'],
+    include: ['src/**/*.{spec,test}.{js,jsx,ts,tsx}'],
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
include: ['src/**/*.spec.{js,jsx,ts,tsx}'],
include: ['src/**/*.{spec,test}.{js,jsx,ts,tsx}'],

Comment on lines +19 to +20
'<rootDir>/src/**/*.test.{js,jsx,ts,tsx}',

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

The .spec files need to be included in the test pattern

The codebase contains active test files using the .spec.{ts,tsx} pattern that contain real test cases using Vitest. These files need to be included in the test pattern to ensure all tests are executed.

  • src/Constant/constant.spec.ts: Contains multiple test cases for constants
  • src/components/Advertisements/Advertisements.spec.tsx: Contains comprehensive component tests using Vitest

Update the testMatch pattern in jest.config.js to include both patterns:

'<rootDir>/src/**/*.{test,spec}.{js,jsx,ts,tsx}'
🔗 Analysis chain

Consider keeping .spec.tsx pattern for consistency

The testMatch pattern now only includes .test.{js,jsx,ts,tsx} files. Since this PR is migrating from Jest to Vitest, consider keeping the .spec.tsx pattern to avoid missing any existing test files.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Search for any .spec files that might be missed
fd -e spec.tsx -e spec.ts -e spec.jsx -e spec.js

Length of output: 134


Script:

#!/bin/bash
# Let's check if these .spec files are actually being picked up by the test runner
# by searching for test execution patterns in them
rg -U "describe|test|it\(" src/Constant/constant.spec.ts src/components/Advertisements/Advertisements.spec.tsx

Length of output: 2419

Comment on lines +70 to +72
"test:vitest": "vitest run",
"test:vitest:watch": "vitest",
"test:vitest:coverage": "vitest run --coverage",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Remove duplicate test:vitest script

There's a duplicate test:vitest script entry. The first set of Vitest scripts at lines 70-72 appears to be more complete with watch and coverage options.

Remove the duplicate entry:

-    "test:vitest": "vitest --run"

Also applies to: 86-86

🧰 Tools
🪛 Biome (1.9.4)

[error] 70-70: The key test:vitest was already declared.

This where a duplicated key was declared again.

If a key is defined multiple times, only the last definition takes effect. Previous definitions are ignored.

(lint/suspicious/noDuplicateObjectKeys)

Comment on lines +141 to +146
"jest-localstorage-mock": "^2.4.19",
"jest-location-mock": "^2.0.0",
"jest-preview": "^0.3.1",
"jsdom": "^25.0.1",
"lcov-result-merger": "^5.0.1",
"lint-staged": "^15.2.8",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Clean up redundant Jest dependencies

Since we're migrating to Vitest, the following Jest-related dependencies can be removed:

-    "jest": "^27.4.5",
-    "jest-localstorage-mock": "^2.4.19",
-    "jest-location-mock": "^2.0.0",
-    "jest-preview": "^0.3.1",

Committable suggestion skipped: line range outside the PR's diff.

Comment on lines +64 to +82
// let mockID: string | undefined = '1';
// vi.mock('react-router-dom', () => ({
// ...vi.importActual('react-router-dom'),
// useParams: () => ({ orgId: mockID }),
// }));
let mockID: string | undefined = '1';
vi.mock(
'react-router-dom',
async (importOriginal: () => Promise<typeof import('react-router-dom')>) => {
const actual = await importOriginal();
return {
...actual,
useParams: () => ({ orgId: mockID }),
BrowserRouter: ({ children }: { children: React.ReactNode }) => (
<div>{children}</div>
),
};
},
);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix TypeScript error in router mock implementation

The router mock implementation contains a TypeScript error with the import type annotation.

Apply this diff to fix the type annotation:

-  async (importOriginal: () => Promise<typeof import('react-router-dom')>) => {
+  async (importOriginal: () => Promise<object>) => {
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
// let mockID: string | undefined = '1';
// vi.mock('react-router-dom', () => ({
// ...vi.importActual('react-router-dom'),
// useParams: () => ({ orgId: mockID }),
// }));
let mockID: string | undefined = '1';
vi.mock(
'react-router-dom',
async (importOriginal: () => Promise<typeof import('react-router-dom')>) => {
const actual = await importOriginal();
return {
...actual,
useParams: () => ({ orgId: mockID }),
BrowserRouter: ({ children }: { children: React.ReactNode }) => (
<div>{children}</div>
),
};
},
);
let mockID: string | undefined = '1';
vi.mock(
'react-router-dom',
async (importOriginal: () => Promise<object>) => {
const actual = await importOriginal();
return {
...actual,
useParams: () => ({ orgId: mockID }),
BrowserRouter: ({ children }: { children: React.ReactNode }) => (
<div>{children}</div>
),
};
},
);
🧰 Tools
🪛 eslint

[error] 72-72: import() type annotations are forbidden.

(@typescript-eslint/consistent-type-imports)

@palisadoes
Copy link
Contributor

We have a policy of unassigning contributors who close PRs without getting validation from our reviewer team. This is because:

  1. We start looking for people to review PRs when you submit them.
  2. We often contact them and link to the PR. If the PR is closed the whole effort is wasted.
  3. The historical thread of reviewer comments is broken when the work is spread across multiple PRs. The quality of our code is affected negatively.

Please be considerate of our volunteers' limited time and our desire to improve our code base.

This policy is stated as a pinned post in all our Talawa repositories. Our YouTube videos explain why this practice is not acceptable to our Community.

In most cases you don’t have to close the PR to trigger the GitHub workflow to run again. Making a new commit and pushing it to your GitHub account will normally be sufficient.

Unfortunately, if this continues we will have to close the offending PR and unassign you from the issue.

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.

8 participants