From 1c323486015305f817693b5d8a5aa6b574546bdb Mon Sep 17 00:00:00 2001
From: Ajoy Kumar Das <ajoykumardas08@gmail.com>
Date: Sat, 20 Jan 2024 11:19:35 +0530
Subject: [PATCH 1/2] fix:failing tests

---
 .../components/UserProfileWithGitHubLogin.tsx |  2 +-
 .../NewMemberSection/NewMemberCard/index.tsx  |  4 +--
 .../components/navbar/NavbarDesktop.test.tsx  |  4 ---
 .../new-member-card/NewMembersCard.test.js    | 26 +++++++++-----
 .../__snapshots__/NewMembersCard.test.js.snap | 34 +++++++++----------
 5 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/components/Layout/Navbar/components/UserProfileWithGitHubLogin.tsx b/src/components/Layout/Navbar/components/UserProfileWithGitHubLogin.tsx
index dfc54be..edf7251 100644
--- a/src/components/Layout/Navbar/components/UserProfileWithGitHubLogin.tsx
+++ b/src/components/Layout/Navbar/components/UserProfileWithGitHubLogin.tsx
@@ -2,7 +2,7 @@ import { Box, Button, Text } from "@chakra-ui/react";
 import Image from "next/image";
 import Link from "next/link";
 import { Dispatch, FC, SetStateAction } from "react";
-import { getAuthUrl } from "@/src/utils/auth";
+import { getAuthUrl } from "../../../../utils/auth";
 
 import { NavbarTypes } from "../types/navbar";
 import dummyImage from "../../../../../public/images/Avatar.png";
diff --git a/src/components/NewMemberSection/NewMemberCard/index.tsx b/src/components/NewMemberSection/NewMemberCard/index.tsx
index f7dd402..ae0937d 100644
--- a/src/components/NewMemberSection/NewMemberCard/index.tsx
+++ b/src/components/NewMemberSection/NewMemberCard/index.tsx
@@ -4,9 +4,9 @@ import { useDispatch, useSelector } from "react-redux";
 import {
   setIsUserRoleUpdateModalVisible,
   setUserSkillModalVisibility,
-} from "@/src/store/superUserOptions";
+} from "../../../store/superUserOptions";
 import { RootState } from "@/src/store";
-import { useGetIsSuperUser } from "@/src/utils/customHooks";
+import { useGetIsSuperUser } from "../../../utils/customHooks";
 import { useRouter } from "next/router";
 import { UserType } from "../../MembersSectionNew/types/MembersSection.type";
 
diff --git a/src/test/unit/components/navbar/NavbarDesktop.test.tsx b/src/test/unit/components/navbar/NavbarDesktop.test.tsx
index 3f25f6b..b92f027 100644
--- a/src/test/unit/components/navbar/NavbarDesktop.test.tsx
+++ b/src/test/unit/components/navbar/NavbarDesktop.test.tsx
@@ -11,7 +11,6 @@ describe("NavbarDesktop component", () => {
     renderWithProviders(
       <NavbarDesktop
         isLoggedIn={false}
-        isDropdownVisible={false}
         firstName={null}
         imageURL={null}
         setIsDropdownVisible={setIsDropdownVisible}
@@ -32,7 +31,6 @@ describe("NavbarDesktop component", () => {
     renderWithProviders(
       <NavbarDesktop
         isLoggedIn={false}
-        isDropdownVisible={false}
         firstName={null}
         imageURL={null}
         setIsDropdownVisible={setIsDropdownVisible}
@@ -60,7 +58,6 @@ describe("NavbarDesktop component", () => {
     renderWithProviders(
       <NavbarDesktop
         isLoggedIn={false}
-        isDropdownVisible={false}
         firstName={null}
         imageURL={null}
         setIsDropdownVisible={setIsDropdownVisible}
@@ -107,7 +104,6 @@ describe("NavbarDesktop component", () => {
     renderWithProviders(
       <NavbarDesktop
         isLoggedIn={true}
-        isDropdownVisible={false}
         firstName={first_name}
         imageURL={imageURL}
         setIsDropdownVisible={setIsDropdownVisible}
diff --git a/src/test/unit/components/new-member-card/NewMembersCard.test.js b/src/test/unit/components/new-member-card/NewMembersCard.test.js
index 98f7348..a5b8c36 100644
--- a/src/test/unit/components/new-member-card/NewMembersCard.test.js
+++ b/src/test/unit/components/new-member-card/NewMembersCard.test.js
@@ -1,18 +1,26 @@
-import { render } from "@testing-library/react";
+import { renderWithProviders } from "../../../../test__utils/renderWithProvides";
 import React from "react";
-import NewMembersCard from "./../../../../../src/components/NewMember/index";
+import NewMembersCard from "../../../../components/NewMemberSection/NewMemberCard/index";
+import { userData } from "../../../../mocks/db/user";
+
+jest.mock("next/router", () => ({
+     useRouter() {
+         return {
+             route: "/",
+             pathname: "",
+             query: "",
+             asPath: "",
+         };
+     },
+ }));
 
 describe("NewMembersCard", () => {
      it("renders the component", () => {
-          const newMemberFirstName = "Sunny";
-          const newMemberLastName = "Kumar";
-          const newMemberImageSrc = "/../../../public/images/Avatar.png";
+          const user = userData;
 
-          const { container } = render(
+          const { container } = renderWithProviders(
                <NewMembersCard
-                    newMemberFirstName={newMemberFirstName}
-                    newMemberLastName={newMemberLastName}
-                    newMemberImageSrc={newMemberImageSrc}
+                    user={user}
                />
           );
           expect(container).toMatchSnapshot();
diff --git a/src/test/unit/components/new-member-card/__snapshots__/NewMembersCard.test.js.snap b/src/test/unit/components/new-member-card/__snapshots__/NewMembersCard.test.js.snap
index 6ca5600..96ccf1e 100644
--- a/src/test/unit/components/new-member-card/__snapshots__/NewMembersCard.test.js.snap
+++ b/src/test/unit/components/new-member-card/__snapshots__/NewMembersCard.test.js.snap
@@ -2,34 +2,32 @@
 
 exports[`NewMembersCard renders the component 1`] = `
 <div>
-  <div
-    class="flex bg-white max-w-sm rounded-md transition-shadow duration-300 h-35 overflow-hidden"
+  <button
+    class="new_user_container css-0"
   >
     <div
-      class="p-4 rounded-md"
+      class="new_user_main css-0"
     >
       <div
-        class="text-center p-2"
+        class="new_user__image_container css-0"
       >
         <img
-          alt="Sunny Kumar"
-          class="rounded-full mx-auto"
-          data-nimg="1"
+          alt=""
+          data-nimg="fill"
           decoding="async"
-          height="60"
           loading="lazy"
-          src="/_next/image?url=%2F..%2F..%2F..%2Fpublic%2Fimages%2FAvatar.png&w=128&q=75"
-          srcset="/_next/image?url=%2F..%2F..%2F..%2Fpublic%2Fimages%2FAvatar.png&w=64&q=75 1x, /_next/image?url=%2F..%2F..%2F..%2Fpublic%2Fimages%2FAvatar.png&w=128&q=75 2x"
-          style="color: transparent;"
-          width="60"
+          sizes="100vw"
+          src="/_next/image?url=%2Fimages%2FAvatar.png&w=3840&q=75"
+          srcset="/_next/image?url=%2Fimages%2FAvatar.png&w=640&q=75 640w, /_next/image?url=%2Fimages%2FAvatar.png&w=750&q=75 750w, /_next/image?url=%2Fimages%2FAvatar.png&w=828&q=75 828w, /_next/image?url=%2Fimages%2FAvatar.png&w=1080&q=75 1080w, /_next/image?url=%2Fimages%2FAvatar.png&w=1200&q=75 1200w, /_next/image?url=%2Fimages%2FAvatar.png&w=1920&q=75 1920w, /_next/image?url=%2Fimages%2FAvatar.png&w=2048&q=75 2048w, /_next/image?url=%2Fimages%2FAvatar.png&w=3840&q=75 3840w"
+          style="position: absolute; height: 100%; width: 100%; left: 0px; top: 0px; right: 0px; bottom: 0px; color: transparent; border-radius: 50%;"
         />
-        <p
-          class="py-2 font-bold"
-        >
-          Sunny Kumar
-        </p>
       </div>
+      <p
+        class="chakra-text css-0"
+      >
+        vinayak trivedi
+      </p>
     </div>
-  </div>
+  </button>
 </div>
 `;

From 26c6c1666196026c522050a4d31c14a74b18e48d Mon Sep 17 00:00:00 2001
From: Ajoy Kumar Das <ajoykumardas08@gmail.com>
Date: Sat, 20 Jan 2024 15:39:33 +0530
Subject: [PATCH 2/2] chore:fix-merge-conflicts

---
 .../components/UserProfileWithGitHubLogin.tsx | 10 +---
 .../new-member-card/NewMembersCard.test.js    | 58 +++++--------------
 2 files changed, 17 insertions(+), 51 deletions(-)

diff --git a/src/components/Layout/Navbar/components/UserProfileWithGitHubLogin.tsx b/src/components/Layout/Navbar/components/UserProfileWithGitHubLogin.tsx
index 86092cd..e8544a1 100644
--- a/src/components/Layout/Navbar/components/UserProfileWithGitHubLogin.tsx
+++ b/src/components/Layout/Navbar/components/UserProfileWithGitHubLogin.tsx
@@ -1,16 +1,8 @@
-<<<<<<< HEAD
-import { Box, Button, Text } from "@chakra-ui/react";
-import Image from "next/image";
-import Link from "next/link";
-import { Dispatch, FC, SetStateAction } from "react";
-import { getAuthUrl } from "../../../../utils/auth";
-=======
 import { Box, Button, Text } from '@chakra-ui/react';
 import Image from 'next/image';
 import Link from 'next/link';
 import { Dispatch, FC, SetStateAction } from 'react';
-import { getAuthUrl } from '@/src/utils/auth';
->>>>>>> develop
+import { getAuthUrl } from '../../../../utils/auth';
 
 import { NavbarTypes } from '../types/navbar';
 import dummyImage from '../../../../../public/images/Avatar.png';
diff --git a/src/test/unit/components/new-member-card/NewMembersCard.test.js b/src/test/unit/components/new-member-card/NewMembersCard.test.js
index 6ccb973..3cad68e 100644
--- a/src/test/unit/components/new-member-card/NewMembersCard.test.js
+++ b/src/test/unit/components/new-member-card/NewMembersCard.test.js
@@ -1,50 +1,24 @@
-<<<<<<< HEAD
-import { renderWithProviders } from "../../../../test__utils/renderWithProvides";
-import React from "react";
-import NewMembersCard from "../../../../components/NewMemberSection/NewMemberCard/index";
-import { userData } from "../../../../mocks/db/user";
-
-jest.mock("next/router", () => ({
-     useRouter() {
-         return {
-             route: "/",
-             pathname: "",
-             query: "",
-             asPath: "",
-         };
-     },
- }));
-
-describe("NewMembersCard", () => {
-     it("renders the component", () => {
-          const user = userData;
-
-          const { container } = renderWithProviders(
-               <NewMembersCard
-                    user={user}
-               />
-          );
-          expect(container).toMatchSnapshot();
-     });
-=======
-import { render } from '@testing-library/react';
+import { renderWithProviders } from '../../../../test__utils/renderWithProvides';
 import React from 'react';
-import NewMembersCard from './../../../../../src/components/NewMember/index';
+import NewMembersCard from '../../../../components/NewMemberSection/NewMemberCard/index';
+import { userData } from '../../../../mocks/db/user';
+
+jest.mock('next/router', () => ({
+  useRouter() {
+    return {
+      route: '/',
+      pathname: '',
+      query: '',
+      asPath: '',
+    };
+  },
+}));
 
 describe('NewMembersCard', () => {
   it('renders the component', () => {
-    const newMemberFirstName = 'Sunny';
-    const newMemberLastName = 'Kumar';
-    const newMemberImageSrc = '/../../../public/images/Avatar.png';
+    const user = userData;
 
-    const { container } = render(
-      <NewMembersCard
-        newMemberFirstName={newMemberFirstName}
-        newMemberLastName={newMemberLastName}
-        newMemberImageSrc={newMemberImageSrc}
-      />,
-    );
+    const { container } = renderWithProviders(<NewMembersCard user={user} />);
     expect(container).toMatchSnapshot();
   });
->>>>>>> develop
 });