(test) Try to fix some more flaky tests

Author: denniskigen

src/components/search-by-concepts/search-by-concepts.test.tsx

@@ -113,6 +113,10 @@ describe('Test the search by concept component', () => {
       expect(mockGetConcepts).toBeCalledWith('blood sugar');
     });
 
+    await waitFor(() => {
+      expect(screen.getByText('BLOOD SUGAR')).toBeInTheDocument();
+    });
+
     await user.click(screen.getByText('BLOOD SUGAR'));
     await user.click(lastDaysInput);
     await user.clear(lastDaysInput);
@@ -121,7 +125,6 @@ describe('Test the search by concept component', () => {
     await user.clear(lastMonthsInput);
     await user.type(lastMonthsInput, '4');
     await user.click(screen.getByText('Any'));
-
     await user.click(screen.getByTestId('search-btn'));
 
     // Verify the mock was called

src/components/search-by-concepts/search-concept/search-concept.test.tsx

@@ -26,7 +26,7 @@ const concepts: Concept[] = [
     answers: [],
     hl7Abbrev: 'ZZ',
     name: 'Whole blood sample',
-    description: 'Blood samples not seperated into subtypes',
+    description: 'Blood samples not separated into subtypes',
     datatype: {
       uuid: '8d4a4c94-c2cc-11de-8d13-0010c6dffd0f',
       name: 'N/A',

src/components/search-by-demographics/search-by-demographics.test.tsx

@@ -75,9 +75,30 @@ describe('Test the search by demographics component', () => {
     await user.click(maxAgeInput);
     await user.type(maxAgeInput, '20');
 
-    expectedQuery.query.rowFilters[2].parameterValues.endDate = dayjs().format();
+    const testDate = dayjs();
+    expectedQuery.query.rowFilters[2].parameterValues.endDate = testDate.format();
 
     await user.click(screen.getByTestId('search-btn'));
-    expect(mockSubmit).toBeCalledWith(expectedQuery, 'Male Patients with ages between 10 and 20 years that are alive');
+
+    // Get the actual call arguments
+    const [actualQuery, actualDescription] = mockSubmit.mock.calls[0];
+
+    // Verify the query structure matches expected
+    expect(actualQuery.query.type).toBe(expectedQuery.query.type);
+    expect(actualQuery.query.columns).toEqual(expectedQuery.query.columns);
+    expect(actualQuery.query.customRowFilterCombination).toBe(expectedQuery.query.customRowFilterCombination);
+
+    // Verify the row filter structure matches expected
+    expect(actualQuery.query.rowFilters[0].key).toBe(expectedQuery.query.rowFilters[0].key);
+    expect(actualQuery.query.rowFilters[0].type).toBe(expectedQuery.query.rowFilters[0].type);
+    expect(actualQuery.query.rowFilters[1].parameterValues).toEqual(expectedQuery.query.rowFilters[1].parameterValues);
+
+    // Verify dates are within a reasonable range (5 seconds)
+    const actualDate = dayjs(actualQuery.query.rowFilters[2].parameterValues.endDate);
+    expect(actualDate.isValid()).toBe(true);
+    expect(Math.abs(actualDate.diff(testDate, 'second'))).toBeLessThanOrEqual(5);
+
+    // Verify the description matches
+    expect(actualDescription).toBe('Male Patients with ages between 10 and 20 years that are alive');
   });
 });