Assert requests are as expected when clicking on items. Remove 2s sle…

…ep that don't need (added to try and debug test).

TODO

@@ -2,6 +2,7 @@
   - unit test cache expiry
     - might need to reduce below polling interval to make this possible?
   - unit test polling
+    - https://mswjs.io/docs/recipes/polling/
   - unit test changing Table localAuthorityId
     - would have found data/currentData bug
     - should go back to loading... state

src/frontend/src/__tests__/App.test.tsx

@@ -5,6 +5,7 @@ import { BASE_PATHNAME, Establishments, LocalAuthorities, LocalAuthority } from
 import { setupServer } from 'msw/node';
 import { http, HttpResponse } from 'msw';
 import { RenderWithStore, serverURL } from './util';
+import { escape, escapeRegExp, flatMap, last } from 'lodash';
 
 function checkBoilerplate() {
   // banner
@@ -172,23 +173,31 @@ describe("App", () => {
 
     // Clicking on an authority
 
-    const establishmentResponseRecords = () => responseRecords.filter(responseRecord => {
+    // Filters out just establishment json requests, then parses the local authority id.
+    const establishmentRequestLocalAuthorityIds = () => flatMap(responseRecords, (responseRecord => {
       const url = new URL(responseRecord.request.url);
-      const isEstablishmentUrl = url.pathname.startsWith(`${BASE_PATHNAME}/localAuthority/`);
-      return isEstablishmentUrl;
-    });
-
-    expect(establishmentResponseRecords()).toHaveLength(0);
-
-    await selectLocalAuthority(localAuthorities[0].localAuthorityId, user);
-    await new Promise(r => setTimeout(r, 2000));
-    expect(establishmentResponseRecords()).toHaveLength(1);
-
-    await selectLocalAuthority(localAuthorities[1].localAuthorityId, user);
-    expect(establishmentResponseRecords()).toHaveLength(2);
-
+      const pattern = escapeRegExp(`${BASE_PATHNAME}/localAuthority/`) + '([0-9]+)';
+      const match = url.pathname.match(pattern);
+      return match ? [ match[1] ] : [];
+    }));
+
+    expect(establishmentRequestLocalAuthorityIds()).toHaveLength(0);
+
+    // Click on one item.
+    const localAuthorityId0 = localAuthorities[0].localAuthorityId;
+    await selectLocalAuthority(localAuthorityId0, user);
+    expect(establishmentRequestLocalAuthorityIds()).toHaveLength(1);
+    expect(last(establishmentRequestLocalAuthorityIds())).toEqual(localAuthorityId0.toString());
+
+    // Click on another item.
+    const localAuthorityId1 = localAuthorities[1].localAuthorityId;
+    await selectLocalAuthority(localAuthorityId1, user);
+    expect(establishmentRequestLocalAuthorityIds()).toHaveLength(2);
+    expect(last(establishmentRequestLocalAuthorityIds())).toEqual(localAuthorityId1.toString());
+
+    // Clicking on first item again.
     await selectLocalAuthority(localAuthorities[1].localAuthorityId, user);
-    expect(establishmentResponseRecords()).toHaveLength(2);
+    expect(establishmentRequestLocalAuthorityIds()).toHaveLength(2); // cached by RTK query.
 
   });