Fix/broken tests on develop

config/vite.config.ts

@@ -159,24 +159,28 @@ export default defineConfig(({ mode }) => {
         debug: process.env.NODE_ENV === 'development',
         basePath: 'src/plugin/available',
       }),
-      istanbul({
-        extension: ['.js', '.ts', '.jsx', '.tsx'],
-        requireEnv: true,
-        cypress: true,
-        include: [
-          'src/screens/**/*.{js,jsx,ts,tsx}',
-          'src/components/**/*.{js,jsx,ts,tsx}',
-          'src/subComponents/**/*.{js,jsx,ts,tsx}',
-        ],
-        exclude: [
-          'node_modules/**',
-          'cypress/**',
-          'coverage/**',
-          '.nyc_output/**',
-          'src/**/*.spec.{ts,tsx,js,jsx}',
-          'src/**/__tests__/**',
-        ],
-      }),
+      ...(process.env.CYPRESS_COVERAGE === 'true'
+        ? [
+            istanbul({
+              extension: ['.js', '.ts', '.jsx', '.tsx'],
+              requireEnv: true,
+              cypress: true,
+              include: [
+                'src/screens/**/*.{js,jsx,ts,tsx}',
+                'src/components/**/*.{js,jsx,ts,tsx}',
+                'src/subComponents/**/*.{js,jsx,ts,tsx}',
+              ],
+              exclude: [
+                'node_modules/**',
+                'cypress/**',
+                'coverage/**',
+                '.nyc_output/**',
+                'src/**/*.spec.{ts,tsx,js,jsx}',
+                'src/**/__tests__/**',
+              ],
+            }),
+          ]
+        : []),
     ],
     // Development server configuration
     server: {
@@ -203,42 +207,43 @@ export default defineConfig(({ mode }) => {
           secure: false,
           ws: true,
           configure: (proxy) => {
-            // Log outgoing request
-            proxy.on('proxyReq', (proxyReq, req) => {
-              console.log('\n[PROXY REQUEST]');
-              console.log('Method:', req.method);
-              console.log('URL:', req.url);
-              console.log('Target:', apiTarget + req.url);
-              console.log('Headers:', JSON.stringify(req.headers, null, 2));
-
-              // Check if body exists and log it
-              let body = '';
-              req.on('data', (chunk) => {
-                body += chunk.toString();
-              });
-              req.on('end', () => {
-                if (body) {
-                  console.log('Body:', body);
-                }
-              });
-            });
+            const verbose = env.ALLOW_LOGS === 'true';
 
-            // Log response
-            proxy.on('proxyRes', (proxyRes, req) => {
-              console.log('\n[PROXY RESPONSE]');
-              console.log('Status:', proxyRes.statusCode);
-              console.log('URL:', req.url);
+            if (verbose) {
+              proxy.on('proxyReq', (proxyReq, req) => {
+                console.log('\n[PROXY REQUEST]');
+                console.log('Method:', req.method);
+                console.log('URL:', req.url);
+                console.log('Target:', apiTarget + req.url);
+                console.log('Headers:', JSON.stringify(req.headers, null, 2));
 
-              let responseBody = '';
-              proxyRes.on('data', (chunk) => {
-                responseBody += chunk.toString();
+                let body = '';
+                req.on('data', (chunk) => {
+                  body += chunk.toString();
+                });
+                req.on('end', () => {
+                  if (body) {
+                    console.log('Body:', body);
+                  }
+                });
               });
-              proxyRes.on('end', () => {
-                if (responseBody) {
-                  console.log('Response Body:', responseBody);
-                }
+
+              proxy.on('proxyRes', (proxyRes, req) => {
+                console.log('\n[PROXY RESPONSE]');
+                console.log('Status:', proxyRes.statusCode);
+                console.log('URL:', req.url);
+
+                let responseBody = '';
+                proxyRes.on('data', (chunk) => {
+                  responseBody += chunk.toString();
+                });
+                proxyRes.on('end', () => {
+                  if (responseBody) {
+                    console.log('Response Body:', responseBody);
+                  }
+                });
               });
-            });
+            }
 
             proxy.on('error', (err) => {
               console.error('\n[PROXY ERROR]', err.message);

src/components/AdminPortal/Advertisements/Advertisements.spec.tsx

@@ -349,8 +349,6 @@ describe('Testing Advertisement Component', () => {
 
     await wait();
     expect(screen.getByTestId('searchname')).toBeInTheDocument();
-    expect(screen.getByTestId('searchButton')).toBeInTheDocument();
-
     expect(screen.getByTestId('searchname')).toHaveAttribute(
       'placeholder',
       translations.searchAdvertisements,
@@ -376,10 +374,9 @@ describe('Testing Advertisement Component', () => {
     await wait();
 
     expect(screen.getByTestId('searchname')).toBeInTheDocument();
-    expect(screen.getByTestId('searchButton')).toBeInTheDocument();
     await userEvent.clear(screen.getByTestId('searchname'));
     await userEvent.type(screen.getByTestId('searchname'), 'Cookie shop 6');
-    await userEvent.click(screen.getByTestId('searchButton'));
+    await userEvent.keyboard('{Enter}');
 
     await wait();
     expect(screen.getByText('Cookie shop 6')).toBeInTheDocument();
@@ -409,14 +406,13 @@ describe('Testing Advertisement Component', () => {
     await wait();
 
     expect(screen.getByTestId('searchname')).toBeInTheDocument();
-    expect(screen.getByTestId('searchButton')).toBeInTheDocument();
 
     await userEvent.clear(screen.getByTestId('searchname'));
     await userEvent.type(
       screen.getByTestId('searchname'),
       'this is an active advertisement 6',
     );
-    await userEvent.click(screen.getByTestId('searchButton'));
+    await userEvent.keyboard('{Enter}');
 
     await wait();
     expect(screen.getByText('Cookie shop 6')).toBeInTheDocument();
@@ -446,10 +442,9 @@ describe('Testing Advertisement Component', () => {
     await wait();
 
     expect(screen.getByTestId('searchname')).toBeInTheDocument();
-    expect(screen.getByTestId('searchButton')).toBeInTheDocument();
     await userEvent.clear(screen.getByTestId('searchname'));
     await userEvent.type(screen.getByTestId('searchname'), 'Cookie shop 6');
-    await userEvent.click(screen.getByTestId('searchButton'));
+    await userEvent.keyboard('{Enter}');
 
     await wait();
     expect(screen.getByText('Cookie shop 6')).toBeInTheDocument();
@@ -479,13 +474,12 @@ describe('Testing Advertisement Component', () => {
     await wait();
 
     expect(screen.getByTestId('searchname')).toBeInTheDocument();
-    expect(screen.getByTestId('searchButton')).toBeInTheDocument();
     await userEvent.clear(screen.getByTestId('searchname'));
     await userEvent.type(
       screen.getByTestId('searchname'),
       'this is a completed advertisement 6',
     );
-    await userEvent.click(screen.getByTestId('searchButton'));
+    await userEvent.keyboard('{Enter}');
 
     await wait();
     expect(screen.getByText('Cookie shop 6')).toBeInTheDocument();
@@ -515,10 +509,9 @@ describe('Testing Advertisement Component', () => {
     await wait();
 
     expect(screen.getByTestId('searchname')).toBeInTheDocument();
-    expect(screen.getByTestId('searchButton')).toBeInTheDocument();
     await userEvent.clear(screen.getByTestId('searchname'));
     await userEvent.type(screen.getByTestId('searchname'), 'BandhanSearchedIt');
-    await userEvent.click(screen.getByTestId('searchButton'));
+    await userEvent.keyboard('{Enter}');
     expect(
       screen.getAllByText('Ads not present for this campaign.'),
     ).toHaveLength(2); // both completed and active tab

src/screens/AdminPortal/OrganizationPeople/OrganizationPeople.spec.tsx

@@ -25,7 +25,7 @@ import {
 import { REMOVE_MEMBER_MUTATION_PG } from 'GraphQl/Mutations/mutations';
 import { store } from 'state/store';
 import { NotificationToast } from 'components/NotificationToast/NotificationToast';
-import type { InterfaceSearchFilterBarAdvanced } from 'types/shared-components/SearchFilterBar/interface';
+import type { InterfaceToolbarProps } from 'types/shared-components/Toolbar/interface';
 
 vi.mock('components/NotificationToast/NotificationToast', () => ({
   NotificationToast: {
@@ -45,35 +45,28 @@ vi.mock('./addMember/AddMember', () => ({
   ),
 }));
 
-vi.mock(
-  'shared-components/SearchFilterBar/SearchFilterBar',
-  async (importOriginal) => {
-    const actual =
-      await importOriginal<
-        typeof import('shared-components/SearchFilterBar/SearchFilterBar')
-      >();
-    return {
-      default: (props: React.ComponentProps<typeof actual.default>) => (
-        <>
-          <actual.default {...props} />
-          <button
-            type="button"
-            data-testid="trigger-invalid-sort"
-            onClick={() => {
-              if (props.hasDropdowns) {
-                (
-                  props as InterfaceSearchFilterBarAdvanced
-                ).dropdowns?.[0]?.onOptionChange?.('invalid');
-              }
-            }}
-          >
-            Invalid Sort
-          </button>
-        </>
-      ),
-    };
-  },
-);
+vi.mock('shared-components/Toolbar/Toolbar', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('shared-components/Toolbar/Toolbar')>();
+  return {
+    default: (props: InterfaceToolbarProps) => (
+      <>
+        <actual.default {...props} />
+        <button
+          type="button"
+          data-testid="trigger-invalid-sort"
+          onClick={() => {
+            const handler = props.filters?.[0]?.onChange;
+            if (!handler) throw new Error('Expected filter onChange handler');
+            handler('invalid');
+          }}
+        >
+          Invalid Sort
+        </button>
+      </>
+    ),
+  };
+});
 
 vi.mock('shared-components/BreadcrumbsComponent/SafeBreadcrumbs', () => ({
   default: ({

src/screens/AdminPortal/SubTags/SubTags.spec.tsx

@@ -1,7 +1,14 @@
 import React from 'react';
 import { MockedProvider } from '@apollo/react-testing';
 import type { RenderResult } from '@testing-library/react';
-import { act, cleanup, render, screen, waitFor } from '@testing-library/react';
+import {
+  act,
+  cleanup,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+} from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { I18nextProvider } from 'react-i18next';
 import { Provider } from 'react-redux';
@@ -239,10 +246,9 @@ describe('Organisation Tags Page', () => {
       ).toBeInTheDocument();
     });
     const input = screen.getByPlaceholderText(translations.searchByName);
-    // Test trimming: add spaces that should be trimmed by the component
-    await user.clear(input);
-    await user.type(input, '  searchSubTag  ');
-    await user.click(screen.getByTestId('searchBtn'));
+    // Set value at once to avoid intermediate unmatched queries
+    fireEvent.change(input, { target: { value: '  searchSubTag  ' } });
+    await user.keyboard('{Enter}');
 
     // should render the two searched tags from the mock data
     // where name starts with "searchSubTag" (mocks are configured for this)