chore: improve existing tests according improved mocks

Author: rogaldh

app/components/common/__tests__/BaseInstructionCard.spec.tsx

@@ -1,17 +1,17 @@
 import { intoTransactionInstructionFromVersionedMessage } from '@components/inspector/utils';
-import { ASSOCIATED_PROGRAM_ID } from '@coral-xyz/anchor/dist/cjs/utils/token';
+import { ASSOCIATED_TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { render, screen } from '@testing-library/react';
 
-import { mockUseSearchParams } from '@/app/__tests__/utils';
+import * as stubs from '@/app/__tests__/mock-stubs';
+import * as mock from '@/app/__tests__/mocks';
 import { ClusterProvider } from '@/app/providers/cluster';
 import { ScrollAnchorProvider } from '@/app/providers/scroll-anchor';
 
-import * as mock from '../../inspector/__tests__/mocks';
 import { BaseInstructionCard } from '../BaseInstructionCard';
 
 describe('BaseInstructionCard', () => {
     beforeEach(() => {
-        mockUseSearchParams();
+        mock.mockUseSearchParams();
     });
 
     afterEach(() => {
@@ -20,9 +20,9 @@ describe('BaseInstructionCard', () => {
 
     test('should render "BaseInstructionCard"', async () => {
         const index = 1;
-        const m = mock.deserializeMessageV0(mock.message2);
+        const m = mock.deserializeMessageV0(stubs.aTokenMsg);
         const ti = intoTransactionInstructionFromVersionedMessage(m.compiledInstructions[index], m);
-        expect(ti.programId.equals(ASSOCIATED_PROGRAM_ID)).toBeTruthy();
+        expect(ti.programId.equals(ASSOCIATED_TOKEN_PROGRAM_ID)).toBeTruthy();
 
         // check that component is rendered properly
         render(
@@ -38,9 +38,9 @@ describe('BaseInstructionCard', () => {
 
     test('should render "BaseInstructionCard" with raw data', async () => {
         const index = 1;
-        const m = mock.deserializeMessageV0(mock.message2);
+        const m = mock.deserializeMessageV0(stubs.aTokenMsg);
         const ti = intoTransactionInstructionFromVersionedMessage(m.compiledInstructions[index], m);
-        expect(ti.programId.equals(ASSOCIATED_PROGRAM_ID)).toBeTruthy();
+        expect(ti.programId.equals(ASSOCIATED_TOKEN_PROGRAM_ID)).toBeTruthy();
 
         // check that component is rendered properly
         render(

app/components/instruction/__tests__/ComputeBudgetDetailsCard.spec.tsx

@@ -2,23 +2,21 @@ import { BaseInstructionCard } from '@components/common/BaseInstructionCard';
 import { intoTransactionInstructionFromVersionedMessage } from '@components/inspector/utils';
 import { ComputeBudgetProgram, MessageCompiledInstruction } from '@solana/web3.js';
 import { render, screen } from '@testing-library/react';
-import { useSearchParams } from 'next/navigation';
 
+import * as stubs from '@/app/__tests__/mock-stubs';
+import * as mock from '@/app/__tests__/mocks';
 import { ClusterProvider } from '@/app/providers/cluster';
 import { ScrollAnchorProvider } from '@/app/providers/scroll-anchor';
 
-import * as mock from '../../inspector/__tests__/mocks';
 import { ComputeBudgetDetailsCard } from '../ComputeBudgetDetailsCard';
 
 jest.mock('next/navigation');
-// @ts-expect-error does not contain `mockReturnValue`
-useSearchParams.mockReturnValue({
-    get: () => 'devnet',
-    has: (_query?: string) => false,
-    toString: () => '',
-});
 
-describe('ComputeBudgetDetailsCard', () => {
+describe('instruction::ComputeBudgetDetailsCard', () => {
+    beforeEach(() => {
+        mock.mockUseSearchParams();
+    });
+
     afterEach(() => {
         jest.clearAllMocks();
     });
@@ -30,30 +28,25 @@ describe('ComputeBudgetDetailsCard', () => {
             programIdIndex: 6,
         };
 
-        const ti = intoTransactionInstructionFromVersionedMessage(
-            compiledInstruction,
-            mock.deserialize(mock.message1),
-            ComputeBudgetProgram.programId
-        );
-        expect(ti).not.toBeUndefined();
-        expect(ti?.programId).toBe(ComputeBudgetProgram.programId);
+        const index = 0;
+        const m = mock.deserializeMessageV0(stubs.computeBudgetMsg);
+        const ti = intoTransactionInstructionFromVersionedMessage(compiledInstruction, m);
+        expect(ti.programId.equals(ComputeBudgetProgram.programId)).toBeTruthy();
 
         // check that component is rendered properly
-        ti &&
-            render(
-                <ScrollAnchorProvider>
-                    <ClusterProvider>
-                        <ComputeBudgetDetailsCard
-                            key={1}
-                            ix={ti}
-                            index={1}
-                            result={{ err: null }}
-                            signature={''}
-                            InstructionCardComponent={BaseInstructionCard}
-                        />
-                    </ClusterProvider>
-                </ScrollAnchorProvider>
-            );
+        render(
+            <ScrollAnchorProvider>
+                <ClusterProvider>
+                    <ComputeBudgetDetailsCard
+                        ix={ti}
+                        index={index}
+                        result={{ err: null }}
+                        signature={''}
+                        InstructionCardComponent={BaseInstructionCard}
+                    />
+                </ClusterProvider>
+            </ScrollAnchorProvider>
+        );
         expect(screen.getByText(/7.187812 lamports per compute unit/)).toBeInTheDocument();
     });
 
@@ -64,30 +57,25 @@ describe('ComputeBudgetDetailsCard', () => {
             programIdIndex: 6,
         };
 
-        const ti = intoTransactionInstructionFromVersionedMessage(
-            compiledInstruction,
-            mock.deserialize(mock.message1),
-            ComputeBudgetProgram.programId
-        );
-        expect(ti).not.toBeUndefined();
-        expect(ti?.programId).toBe(ComputeBudgetProgram.programId);
+        const index = 1;
+        const m = mock.deserializeMessageV0(stubs.computeBudgetMsg);
+        const ti = intoTransactionInstructionFromVersionedMessage(compiledInstruction, m);
+        expect(ti.programId.equals(ComputeBudgetProgram.programId)).toBeTruthy();
 
         // check that component is rendered properly
-        ti &&
-            render(
-                <ScrollAnchorProvider>
-                    <ClusterProvider>
-                        <ComputeBudgetDetailsCard
-                            key={1}
-                            ix={ti}
-                            index={1}
-                            result={{ err: null }}
-                            signature={''}
-                            InstructionCardComponent={BaseInstructionCard}
-                        />
-                    </ClusterProvider>
-                </ScrollAnchorProvider>
-            );
+        render(
+            <ScrollAnchorProvider>
+                <ClusterProvider>
+                    <ComputeBudgetDetailsCard
+                        ix={ti}
+                        index={index}
+                        result={{ err: null }}
+                        signature={''}
+                        InstructionCardComponent={BaseInstructionCard}
+                    />
+                </ClusterProvider>
+            </ScrollAnchorProvider>
+        );
         expect(screen.getByText(/155.666 compute units/)).toBeInTheDocument();
     });
 });