From efffd4f21a4ef39dfb9692317d01118ad16415ca Mon Sep 17 00:00:00 2001 From: Terry Tsai Date: Wed, 4 May 2022 15:40:53 -0700 Subject: [PATCH] fix lint --- .../RaceOrEthnicityFilterSelect.test.tsx | 1 + .../SupervisionTypeFilterSelect.test.tsx | 1 + ...istoricalPopulationBreakdownMetric.test.ts | 1 + spotlight-client/src/contentModels/Metric.ts | 1 + .../RacialDisparitiesNarrative.test.tsx | 3 +++ .../src/contentModels/Tenant.test.ts | 25 +++++++++++++++---- .../src/metricsApi/fetchMetrics.test.ts | 4 +++ 7 files changed, 31 insertions(+), 5 deletions(-) diff --git a/spotlight-client/src/RacialDisparitiesNarrativePage/RaceOrEthnicityFilterSelect.test.tsx b/spotlight-client/src/RacialDisparitiesNarrativePage/RaceOrEthnicityFilterSelect.test.tsx index 6b415ba6..396629e3 100644 --- a/spotlight-client/src/RacialDisparitiesNarrativePage/RaceOrEthnicityFilterSelect.test.tsx +++ b/spotlight-client/src/RacialDisparitiesNarrativePage/RaceOrEthnicityFilterSelect.test.tsx @@ -37,6 +37,7 @@ beforeEach(() => { tenantId: "US_ND", content: contentFixture.racialDisparitiesNarrative, categoryFilter: contentFixture.demographicCategories.raceOrEthnicity, + getToken: () => Promise.resolve("Test token"), }); render(); diff --git a/spotlight-client/src/RacialDisparitiesNarrativePage/SupervisionTypeFilterSelect.test.tsx b/spotlight-client/src/RacialDisparitiesNarrativePage/SupervisionTypeFilterSelect.test.tsx index d1e3d683..5b15e623 100644 --- a/spotlight-client/src/RacialDisparitiesNarrativePage/SupervisionTypeFilterSelect.test.tsx +++ b/spotlight-client/src/RacialDisparitiesNarrativePage/SupervisionTypeFilterSelect.test.tsx @@ -34,6 +34,7 @@ beforeEach(() => { narrative = RacialDisparitiesNarrative.build({ tenantId: "US_ND", content: contentFixture.racialDisparitiesNarrative, + getToken: () => Promise.resolve("Test token"), }); render(); diff --git a/spotlight-client/src/contentModels/HistoricalPopulationBreakdownMetric.test.ts b/spotlight-client/src/contentModels/HistoricalPopulationBreakdownMetric.test.ts index 6aa92ede..7b53c4e0 100644 --- a/spotlight-client/src/contentModels/HistoricalPopulationBreakdownMetric.test.ts +++ b/spotlight-client/src/contentModels/HistoricalPopulationBreakdownMetric.test.ts @@ -88,6 +88,7 @@ const getMetric = async () => { localityLabels: undefined, dataTransformer: mockTransformer, sourceFileName: mockSourceFileName, + getToken: () => Promise.resolve("Test token"), }); await metric.hydrate(); diff --git a/spotlight-client/src/contentModels/Metric.ts b/spotlight-client/src/contentModels/Metric.ts index 4f26d542..7c060412 100644 --- a/spotlight-client/src/contentModels/Metric.ts +++ b/spotlight-client/src/contentModels/Metric.ts @@ -114,6 +114,7 @@ export default abstract class Metric // we don't really need the entire Tenant object, // only the ID for use in the API request readonly tenantId: TenantId; + readonly getToken: () => Promise; // data properties diff --git a/spotlight-client/src/contentModels/RacialDisparitiesNarrative.test.tsx b/spotlight-client/src/contentModels/RacialDisparitiesNarrative.test.tsx index befdd538..99fc0579 100644 --- a/spotlight-client/src/contentModels/RacialDisparitiesNarrative.test.tsx +++ b/spotlight-client/src/contentModels/RacialDisparitiesNarrative.test.tsx @@ -31,6 +31,7 @@ beforeEach(() => { tenantId: testTenantId, content: contentFixture.racialDisparitiesNarrative, categoryFilter: contentFixture.demographicCategories.raceOrEthnicity, + getToken: () => Promise.resolve("Test token"), }); }); @@ -280,6 +281,7 @@ describe("available categories", () => { tenantId: testTenantId, content: contentFixture.racialDisparitiesNarrative, categoryFilter: undefined, + getToken: () => Promise.resolve("Test token"), }); expect(narrative.allCategories).toMatchSnapshot(); }); @@ -309,6 +311,7 @@ describe("supervision types", () => { supervisionTypes: ["parole"], }, categoryFilter: contentFixture.demographicCategories.raceOrEthnicity, + getToken: () => Promise.resolve("Test token"), }); reactImmediately(() => { diff --git a/spotlight-client/src/contentModels/Tenant.test.ts b/spotlight-client/src/contentModels/Tenant.test.ts index ef1668a0..55728273 100644 --- a/spotlight-client/src/contentModels/Tenant.test.ts +++ b/spotlight-client/src/contentModels/Tenant.test.ts @@ -35,7 +35,10 @@ test.each([ ["partial", partialFixture], ])("create a %s Tenant", (type, fixture) => { retrieveContentMock.mockReturnValue(fixture); - const tenant = createTenant({ tenantId: "US_ND" }); + const tenant = createTenant({ + tenantId: "US_ND", + getToken: () => Promise.resolve("Test token"), + }); expect(tenant.name).toBe(fixture.name); expect(tenant.description).toBe(fixture.description); expect(tenant.coBrandingCopy).toBe(fixture.coBrandingCopy); @@ -48,7 +51,10 @@ test.each([ ])("tenant has %s Metrics", (type, fixture) => { retrieveContentMock.mockReturnValue(fixture); - const tenant = createTenant({ tenantId: "US_ND" }); + const tenant = createTenant({ + tenantId: "US_ND", + getToken: () => Promise.resolve("Test token"), + }); const expectedMetrics = Object.keys(fixture.metrics).filter(isMetricTypeId); expectedMetrics.forEach((metricId) => @@ -63,7 +69,10 @@ test.each([ ])("tenant has %s system narratives", (type, fixture) => { retrieveContentMock.mockReturnValue(fixture); - const tenant = createTenant({ tenantId: "US_ND" }); + const tenant = createTenant({ + tenantId: "US_ND", + getToken: () => Promise.resolve("Test token"), + }); const expectedNarratives = Object.keys(tenant.systemNarratives).filter( isSystemNarrativeTypeId @@ -80,7 +89,10 @@ test.each([ test("tenant has racial disparities narrative", () => { retrieveContentMock.mockReturnValue(exhaustiveFixture); - const tenant = createTenant({ tenantId: "US_ND" }); + const tenant = createTenant({ + tenantId: "US_ND", + getToken: () => Promise.resolve("Test token"), + }); expect(tenant.racialDisparitiesNarrative).toBeInstanceOf( RacialDisparitiesNarrative @@ -90,7 +102,10 @@ test("tenant has racial disparities narrative", () => { test("tenant does not have racial disparities narrative", () => { retrieveContentMock.mockReturnValue(partialFixture); - const tenant = createTenant({ tenantId: "US_ND" }); + const tenant = createTenant({ + tenantId: "US_ND", + getToken: () => Promise.resolve("Test token"), + }); expect(tenant.racialDisparitiesNarrative).toBeUndefined(); }); diff --git a/spotlight-client/src/metricsApi/fetchMetrics.test.ts b/spotlight-client/src/metricsApi/fetchMetrics.test.ts index dc49b6ca..1d4952ed 100644 --- a/spotlight-client/src/metricsApi/fetchMetrics.test.ts +++ b/spotlight-client/src/metricsApi/fetchMetrics.test.ts @@ -34,6 +34,7 @@ describe("fetchMetrics", () => { const response = await fetchMetrics({ metricNames, tenantId, + getToken: () => Promise.resolve("Test token"), }); expect(Object.keys(response)).toEqual(metricNames); @@ -75,6 +76,7 @@ describe("fetchMetrics", () => { await fetchMetrics({ metricNames: ["this_file_does_not_exist"], tenantId: "US_ND", + getToken: () => Promise.resolve("Test token"), }); } catch (e) { expect(e.message).toMatch("500"); @@ -95,6 +97,7 @@ describe("fetchAndTransformMetric", () => { sourceFileName, transformFn, tenantId: "US_ND", + getToken: () => Promise.resolve("Test token"), }); expect(transformedData).toEqual([ @@ -129,6 +132,7 @@ describe("fetchAndTransformMetric", () => { sourceFileName, transformFn: jest.fn(), tenantId: "US_ND", + getToken: () => Promise.resolve("Test token"), }); } catch (e) { expect(e.message).toBe(ERROR_MESSAGES.noMetricData);